diff --git a/HexFiend Template/Mercury Steam Metroid Dread.tcl b/HexFiend Template/Mercury Steam Metroid Dread.tcl
index ddf7e74..2a1bf69 100644
--- a/HexFiend Template/Mercury Steam Metroid Dread.tcl	
+++ b/HexFiend Template/Mercury Steam Metroid Dread.tcl	
@@ -11,56 +11,73 @@ proc parse_tv {} {
     switch $type_id {
         
         0x0C500CA1F3B54C26 {
-            # NavMesh Occluders (2D array)
-            set num_records [uint32 "NavMesh Occluders"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "NavMesh Occluder $i" {
-                    sectionvalue [cstr "utf8"]
-                    set num_nmo [uint32 "Number of subrecords"]
-                    for { set j 0 } { $j < $num_nmo } { incr j } {
-                        parse_tv
+            # TEnabledOccluderCollidersMap
+            section "TEnabledOccluderCollidersMap" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "TEnabledOccluderCollider $i" {
+                        sectionvalue [cstr "utf8"]
+                        set num_nmo [uint32 "Number of subrecords"]
+                        for { set j 0 } { $j < $num_nmo } { incr j } {
+                            parse_tv
+                        }
                     }
                 }
             }
         }
         
         0x1296854B5C530FAF {
-            # MiniMapAreaFirstPoint
-            float "Point 1 X"
-            float "Point 1 Y"
+            # Min (MiniMap Area)
+            float "Min X"
+            float "Min Y"
         }
         
         0x145D990A588908BB {
-            # NavMesh Occluder flag
-            entry "FLAG 145D" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 145D"
         }
         
         0x1792BC17AD716D8D {
-            # MiniMap Visibility
-            set num_records [uint32 "Number of Records"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                uint32 "Index $i"
-                cstr "utf8" "DefString $i"
+            # minimapGrid::TMinimapVisMap
+            section "TMinimapVisMap" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    uint32 "TMinimapVisMap $i"
+                    cstr "utf8" "DefString $i"
+                }
             }
         }
         
+        0x19DDE2116944802A {
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 19DD"
+        }
+        
         0x1A9241A8743F4CAB {
-            # NavMesh Occluder flag
-            entry "FLAG 1A92" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 1A92"
         }
         
         0x1D492D17D698EA76 {
-            # MiniMap Tiles (3D array)
-            set num_records [uint32 "Number of Tiles"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "Tile $i" {
-                    sectionvalue [cstr "utf8"]
-                    set num_points [uint32 "Number of Points"]
-                    for { set j 0 } { $j < $num_points } { incr j } {
-                        section "Point $j" {
-                            set num_props [uint32 "Number of Properties"]
-                            for { set k 0 } { $k < $num_props } { incr k } {
-                                parse_tv
+            # CBreakableTileGroupComponent::TActorTileStatesMap
+            section "TActorTileStatesMap" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "Tile $i" {
+                        sectionvalue [cstr "utf8"]
+                        set num_points [uint32 "Number of Points"]
+                        for { set j 0 } { $j < $num_points } { incr j } {
+                            section "Point $j" {
+                                set num_props [uint32 "Number of Properties"]
+                                for { set k 0 } { $k < $num_props } { incr k } {
+                                    parse_tv
+                                }
                             }
                         }
                     }
@@ -69,259 +86,302 @@ proc parse_tv {} {
         }
         
         0x1D4F060F133F1E29 {
-            # UInt32 or Int32?
-            uint32 "Numeric 1D"
+            # int
+            int32 "int"
         }
         
         0x1DCF8BB14CF6E63A {
-            # NavMesh Occluder flag
-            entry "FLAG 1DCF" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 1DCF"
         }
 
         0x1ED58C7641EFCC2C {
-            # NavMesh Occluder flag
-            entry "FLAG 1ED5" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 1ED5"
+        }
+
+        0x20D3D5E61247C339 {
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 20D3"
         }
 
         0x22B16B436D9EC80D {
-            # List of SaveDataGroups
-            set num_records [uint32 "Number of SDGs"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "SaveDataGroup $i" {
-                    sectionvalue [cstr "utf8"]
-                    parse_tv
+            # hashSections
+            section "hashSections" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "hashSection $i" {
+                        sectionvalue [cstr "utf8"]
+                        parse_tv
+                    }
                 }
             }
         }
         
         0x256582A39FB5119F {
-            # NavMesh Occluder flag
-            entry "FLAG 2565" ""
+            # collision
+            move -8
+            entry "FLAG" "collision" 8
+            move 8
         }
 
         0x2567850CE806D4F8 {
-            # Door state?
-            uint32 "Numeric 25"
+            # CDoorLifeComponent::SState
+            uint32 "CDoorLifeComponent::SState"
         }
 
         0x25E09478B1D26ACF {
+            # base::global::CRntVector<base::global::CStrId>
             # List of Strings
-            set num_strings [uint32 "Number of Strings"]
-            for { set i 0 } { $i < $num_strings } { incr i } {
-                cstr "utf8" "String $i"
+            section "CRntVector<CStrId>" {
+                set num_strings [uint32]
+                sectionvalue "$num_strings entries"
+                for { set i 0 } { $i < $num_strings } { incr i } {
+                    cstr "utf8" "CStrId $i"
+                }
             }
         }
 
         0x2B1A8B33DE7B0C6A {
-            # Boolean
-            int8 -hex "Boolean"
+            # bool
+            int8 -hex "bool"
         }
         
         0x2F6D2F820BE625FA {
-            # NavMesh Occluder flag
-            entry "FLAG 2F6D" ""
+            # collision_closed
+            move -8
+            entry "FLAG" "collision_closed" 8
+            move 8
         }
         
         0x31B88BF33548DE26 {
-            # SubareaSetup String
-            cstr "utf8" "Subarea String"
+            # base::global::TRntString256
+            cstr "utf8" "TRntString256"
         }
         
         0x31D90A80FF583FC1 {
-            # Mission Log Item Identifier
-            cstr "utf8" "Identifier"
+            # sLabelText
+            cstr "utf8" "sLabelText"
         }
         
         0x40BAA540D530AA25 {
-            # NavMesh Occluder flag
-            entry "FLAG 40BA" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 40BA"
         }
         
         0x427DA2B93E7204DE {
-            # NavMesh Occluder flag
-            entry "FLAG 427D" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 427D"
         }
         
         0x48C4218C5F995970 {
-            # Footer?
-            uint32 "Footer Value"
+            # dctDeltaValues
+            uint32 "dctDeltaValues"
         }
 
         0x4DE61CA471BEDCD2 {
-            # Mission Log Item
-            set num_logs [uint32 "Number of Logs"]
-            for { set i 0 } { $i < $num_logs } { incr i } {
-                section "MissionLog $i" {
-                    set num_records [uint32 "Count"]
-                    for { set j 0 } { $j < $num_records } { incr j } {
-                        parse_tv
+            # GUI::CMissionLog::TMissionLogEntries
+            section "TMissionLogEntries" {
+                set num_logs [uint32]
+                sectionvalue "$num_logs entries"
+                for { set i 0 } { $i < $num_logs } { incr i } {
+                    section "MissionLogEntry $i" {
+                        set num_records [uint32 "Count"]
+                        for { set j 0 } { $j < $num_records } { incr j } {
+                            parse_tv
+                        }
                     }
                 }
             }
         }
 
         0x518AD65EBA597493 {
-            # Float
-            float "Numeric (float)"
+            # float
+            float "float"
         }
         
         0x6C83AF6F9CA85C5A {
-            # Root item (userdata.bmssv)
-            section "Header" {
+            # CBlackboard (userdata.bmssv)
+            section "CBlackboard" {
                 uint16 "Version?"
-                set num_records [uint16 "Number of Records"]
+                set num_records [uint16]
+                sectionvalue "$num_records entries"
             }
             for { set i 0 } { $i < $num_records } { incr i } {
-                section "Root Record $i" {
+                section "CBlackboard $i" {
                     parse_tv
                 }
             }
         }
         
         0x6FF3E71C57D6839C {
-            # NavMesh Occluder flag
-            entry "FLAG 6FF3" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 6FF3"
         }
         
         0x72CFCC424A228498 {
-            # Mission Log Item Unknown Value
-            uint32 "Unknown Value 72"
+            # eEntryType (Mission Log Item)
+            uint32 "eEntryType"
         }
 
         0x79C2F775BD2B3138 {
-            # MiniMap Custom Marker Value
-            uint32 "Unknown Value 79"
+            # nTargetSlot (MiniMap Custom Marker)
+            uint32 "nTargetSlot"
         }
         
         0x79F31B83386F08A1 {
-            # MiniMap Custom Marker Value
-            uint32 "Numeric 79"
+            # eType (MiniMap Custom Marker)
+            uint32 "eType"
         }
 
         0x7A64BDD1A5B7F7BF {
-            # MiniMap Tile Payload
-            uint32 "Numeric 7A"
+            # uState (MiniMap Tiles)
+            uint32 "uState"
         }
 
+        0x7BABC0C8085511C2 {
+            # trapblockfinal
+            move -8
+            entry "FLAG" "trapblockfinal" 8
+            move 8
+        }
+        
         0x7EC5E3B4F43F8724 {
-            # List of UInt32
-            set num_ints [uint32 "Number of Numbers"]
-            for { set i 0 } { $i < $num_ints } { incr i } {
-                uint32 "Numeric $i"
+            # base::global::CRntVector<EMapTutoType>
+            section "CRntVector<EMapTutoType>" {
+                set num_ints [uint32]
+                sectionvalue "$num_ints entries"
+                for { set i 0 } { $i < $num_ints } { incr i } {
+                    uint32 "EMapTutoType $i"
+                }
             }
         }
         
-        0x7BABC0C8085511C2 {
-            # NavMesh Occluder flag
-            entry "FLAG 7BAB" ""
-        }
-        
         0x8DC2E7510FAB1F45 {
-            # NavMesh Occluder flag
-            entry "FLAG 8DC2" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG 8DC2"
         }
         
         0x8EF51A47A8CCA255 {
-            # Mission Log Item List of Pages
-            set num_records [uint32 "Number of Pages"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                cstr "utf8" "Page $i"
+            # vCaptionsIds (Mission Log Item)
+            section "vCaptionIds" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    cstr "utf8" "vCaptionId $i"
+                }
             }
         }
         
         0x966FEB6FA3517B49 {
-            # MiniMap Tile Payload
-            float "Point 96"
+            # fY
+            float "fY"
         }
         
         0x9A714C5BDFE4E50F {
-            # MiniMapGlobalIconPoint
-            float "Point X"
-            float "Point Y"
+            # vIconPos (MiniMap Global Icon)
+            float "vIconPos X"
+            float "vIconPos Y"
         }
         
         0xA086BDADD2CF1BE8 {
-            # MiniMap Tile Payload
-            uint32 "Point A0"
+            # eTileType (MiniMap Tile)
+            uint32 "eTileType"
         }
         
         0xAA8881F44964F0C2 {
-            # Last CheckPoint Offset - Unknown Value
-            float "Point X?"
-            float "Point Y?"
-            uint32 "Numeric?"
-            #hex 12 "Unknown Payload"
-            ###########################################################
-            ### TODO
-            ###########################################################
+            # vOffsetPos (Last CheckPoint Offset)
+            float "vOffsetPos X"
+            float "vOffsetPos Y"
+            float "vOffsetPos Z"
         }
         
         0xACCD3DDFD3D4567A {
-            # Last CheckPoint Offset - Unknown Value
-            hex 12 "Unknown Payload"
-            ###########################################################
-            ### TODO
-            ###########################################################
+            # vOffsetAng (Last CheckPoint Offset)
+            float "vOffsetAng X"
+            float "vOffsetAng Y"
+            float "vOffsetAng Z"
         }
         
         0xAFE3B5CB55A6025B {
-            # NavMesh Occluder flag
-            entry "FLAG AFE3" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG AFE3"
         }
         
         0xB7C1F0A2F08B8870 {
-            # Last CheckPoint Offset - Value
-            cstr "utf8" "Area Name"
+            # strCheckpointID (Last CheckPoint Offset)
+            cstr "utf8" "strCheckpointID"
         }
         
         0xBD1406456F93A3F7 {
-            # SaveDataGroup
-            set num_records [uint32 "Number of Containers"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "Container $i" {
-                    parse_tv
+            # CBlackboard::CSection
+            section "CBlackboard:CSection" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "CSection $i" {
+                        parse_tv
+                    }
                 }
             }
         }
 
         0xBDAA54365AE550F4 {
-            # Minimap Area Box
-            set num_records [uint32 "Number of Points"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                parse_tv
+            # base::spatial::CAABox2D (MiniMap Area)
+            section "CAABox2D" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    parse_tv
+                }
             }
         }
         
         0xBF450D514E81EB1B {
-            # MiniMap Custom Markers
-            set num_records [uint32 "Number of Markers"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "Marker $i" {
-                    uint32 "Index"
-                    set num_subs [uint32 "Number of Properties"]
-                    for { set j 0 } { $j < $num_subs } { incr j } {
-                        parse_tv
+            # CMinimapManager::TCustomMarkerDataMap
+            section "TCustomMarkerDataMap" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "TCustomMarkerDataMap $i" {
+                        uint32 "Index"
+                        set num_subs [uint32 "Number of Properties"]
+                        for { set j 0 } { $j < $num_subs } { incr j } {
+                            parse_tv
+                        }
                     }
                 }
             }
         }
         
         0xBF8FE251F17EAD25 {
-            # Last CheckPoint Offset
-            set num_records [uint32 "Number of Records"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                parse_tv
+            # TCheckpointOffset
+            section "TCheckpointOffset" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    parse_tv
+                }
             }
         }
         
         0xBFE26B06920280B2 {
-            # MiniMap Custom Marker Name
-            cstr "utf8" "Name"
+            # sTargetID (MiniMap Custom Marker)
+            cstr "utf8" "sTargetID"
         }
         
         0xC897DE38447F5CF2 {
-            # WATER_VOLUMES / LAVA_VOLUMES
-            set num_records [uint32 "Number of Records"]
+            # ??? WATER_VOLUMES / LAVA_VOLUMES
+            set num_records [uint32 "Number of Volumes"]
             for { set i 0 } { $i < $num_records } { incr i } {
                 section "Volume $i" {
                     sectionvalue [cstr "utf8"]
@@ -334,97 +394,128 @@ proc parse_tv {} {
         }
         
         0xCADF3A163B607F5B {
-            # Occluder Vignettes
-            set num_records [uint32 "Number of Records"]
+            # ??? Occluder Vignettes
+            set num_records [uint32 "Number of Vignettes"]
             for { set i 0 } { $i < $num_records } { incr i } {
-                cstr "utf8" "Vignette $i"
-                int8 -hex "Boolean"
-            }
-        }
-        
-        0xCBC5EA0BB5426634 {
-            # SaveDataGroup container
-            set num_records [uint32 "Number of Records"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "Record $i" {
-                    parse_tv
+                section "Vignette $i" {
+                    sectionvalue [cstr "utf8"]
+                    int8 -hex "Boolean"
                 }
             }
         }
         
-        0xD0BE2F66278BC819 {
-            # Root item (common.bmssv, pkprfl.bmssv, samus.bmssv)
-            section "Header" {
-                uint16 "Version?"
-                set num_records [uint16 "Number of Records"]
+        0xCBC5EA0BB5426634 {
+            # Root
+            section "Root" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "Root $i" {
+                        parse_tv
+                    }
+                }
             }
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "Root Record $i" {
-                    parse_tv
+        }
+        
+        0xD0742138FC74EC08 {
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG D074"
+        }
+
+        0xD0BE2F66278BC819 {
+            # CGameBlackboard (common.bmssv, pkprfl.bmssv, samus.bmssv)
+            section "CGameBlackboard" {
+                uint16 "Version?"
+                set num_records [uint16]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "CGameBlackboard $i" {
+                        parse_tv
+                    }
                 }
             }
         }
         
         0xD1A8336890B4BBDD {
-            # MiniMap Custom Icon Value
-            float "Point X"
-            float "Point Y"
+            # vPos (MiniMap Custom Marker)
+            float "vPos X"
+            float "vPos Y"
         }
         
         0xD4A5EC5A593AE24D {
-            # MiniMapAreaSecondPoint
-            float "Point 2 X"
-            float "Point 2 Y"
+            # Max (MiniMap Area)
+            float "Max X"
+            float "Max Y"
         }
 
         0xD6AC6CD794D87CB9 {
-            # UInt32 or Int32?
-            uint32 -hex "Numeric D6"
+            # unsigned
+            uint32 "unsigned"
         }
         
         0xDBEC65DF4FDE1A6D {
-            # NavMesh Occluder flag
-            entry "FLAG DBEC" ""
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG DBEC"
         }
         
         0xE0D4E713F7819779 {
-            # String (null-terminated)
-            cstr "utf8" "String E0"
+            # base::global::CRntString
+            cstr "utf8" "CRntString"
+        }
+        
+        0xE48BC693150E464F {
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG E48B"
         }
 
         0xE926F01F5C4070D0 {
-            # MiniMapGlobalIconName
-            cstr "utf8" "Icon Name"
+            # sIconID (MiniMap Global Icon)
+            cstr "utf8" "sIconID"
         }
         
         0xE9E090C528ECE3C4 {
-            # Last CheckPoint Offset - Value
+            # ??? Last CheckPoint Offset - Value
             uint32 -hex "Numeric E9"
         }
 
+        0xEC6670556EB06377 {
+            # ??? NavMesh Occluder flag
+            move -8
+            hex 8 "FLAG EC66"
+        }
+
         0xED21C62C3C8D27D7 {
-            # SaveDataContainer (Array)
-            set num_records [uint32 "Number of Entries"]
-            for { set i 0 } { $i < $num_records } { incr i } {
-                section "SaveDataEntry $i" {
-                    sectionvalue [cstr "utf8"]
-                    parse_tv
+            # dctProps
+            section "dctProps" {
+                set num_records [uint32]
+                sectionvalue "$num_records entries"
+                for { set i 0 } { $i < $num_records } { incr i } {
+                    section "dctProp $i" {
+                        sectionvalue [cstr "utf8"]
+                        parse_tv
+                    }
                 }
             }
         }
 
         0xF058F869AB5A36F9 {
-            # Minimap Global Icon Item (3D array)
-            set num_maps [uint32 "Number of Maps"]
-            for { set i 0 } { $i < $num_maps } { incr i } {
-                section "Map $i" {
-                    sectionvalue [cstr "utf8"]
-                    set num_icons [uint32 "Number of Icons"]
-                    for { set j 0 } { $j < $num_icons } { incr j } {
-                        section "Icon $j" {
-                            set num_records [uint32 "Count"]
-                            for { set k 0 } { $k < $num_records } { incr k } {
-                                parse_tv
+            # CMinimapManager::TGlobalMapIcons
+            section "CMinimapManager::TGlobalMapIcons" {
+                set num_maps [uint32]
+                sectionvalue "$num_maps entries"
+                for { set i 0 } { $i < $num_maps } { incr i } {
+                    section "TGlobalMapIcon $i" {
+                        sectionvalue [cstr "utf8"]
+                        set num_icons [uint32 "Number of Icons"]
+                        for { set j 0 } { $j < $num_icons } { incr j } {
+                            section "Icon $j" {
+                                set num_records [uint32 "Count"]
+                                for { set k 0 } { $k < $num_records } { incr k } {
+                                    parse_tv
+                                }
                             }
                         }
                     }
@@ -433,29 +524,35 @@ proc parse_tv {} {
         }
         
         0xF3A3EBFFF0077303 {
-            # MiniMap Custom Marker
-            uint32 "Numeric F3"
+            # nMarkerID (MiniMap Custom Marker)
+            uint32 "nMarkerID"
         }
 
         0xF46AD97DC54A9259 {
-            # NavMesh Item Collider Offset
-            uint32 "X Offset?"
-            uint32 "Y Offset?"
+            # base::math::CVector2D
+            section "CVector2D" {
+                float "X"
+                float "Y"
+            }
         }
 
         0xF6EA0DBA9BF734BF {
-            # String, null-terminated
-            cstr "utf8" "String F6"
+            # base::global::CStrId
+            cstr "utf8" "CStrId"
         }
         
         0xF9304C6C1D1D55FA {
-            # MiniMap Tile payload
-            float "Point F9"
+            # fX (MiniMap Tile)
+            float "fX"
         }
         
         0xF99B092157337B0D {
-            # MiniMap LastPlayerPos
-            hex 12 "Unknown"
+            # base::math::CVector3D (LastPlayerPos)
+            section "CVector3D" {
+                float "X"
+                float "Y"
+                float "Z"
+            }
             ###########################################################
             ### TODO
             ###########################################################
@@ -463,8 +560,8 @@ proc parse_tv {} {
         }
         
         default {
-            entry "Unknown type" $type_id
-            hex 4 "Maybe payload?"
+            entry "### Unknown ###" $type_id
+            hex 4 "### Value ###"
         }
     }
 }