diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9056c427b..5469e4e6c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,3 +27,8 @@ jobs:
           echo codegen produced error
           exit 1
         fi
+    - name: Verify list.pl output
+      run: |
+        ls codegen | sort | grep -v codegen.out.xml > ls.out
+        perl ./list.pl | cut -d/ -f2 | sort > list.pl.out
+        diff ls.out list.pl.out
diff --git a/data-definition.xsd b/data-definition.xsd
index ffdbb3334..9a52a0323 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -119,6 +119,8 @@
 
                 <xs:attribute name="is-union" type="xs:boolean">
                 </xs:attribute>
+                <xs:attribute name="original-name">
+                </xs:attribute>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
diff --git a/df.advmode.xml b/df.advmode.xml
index decfb725d..8bee4f46e 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -490,7 +490,26 @@
         <int32_t name='unk_47'/>
 
         <compound name='unk_3170'>
-            <stl-vector name='unk_1'/>
+            <stl-vector name='unk_1' since='v0.44.10'>
+                <pointer>
+                    <compound name='unk_0' type-name='entity_event'/>
+                    <int32_t name='unk_28'/>
+                    <int32_t name='unk_2c' init-value='-1'/>
+                    <int32_t name='unk_30' init-value='-1'/>
+                    <int32_t name='unk_34' init-value='-1'/>
+                    <int32_t name='unk_38' init-value='-1'/>
+                    <int32_t name='unk_3c' init-value='-1000000'/>
+                    <int32_t name='unk_40' init-value='-1000000'/>
+                    <int32_t name='unk_44' init-value='-1000000'/>
+                    <int32_t name='unk_48' init-value='-1'/>
+                    <int32_t name='unk_4c' init-value='-1'/>
+                    <int32_t name='unk_50' init-value='-1'/>
+                    <int32_t name='unk_54' init-value='-1'/>
+                    <int32_t name='unk_58' init-value='-1000000'/>
+                    <int32_t name='unk_5c' init-value='-1000000'/>
+                    <int32_t name='unk_60' init-value='-1000000'/>
+                </pointer>
+            </stl-vector>
             <static-array name='unk_2' count='17'>
                 <stl-vector name='unk_1'/>
                 <stl-vector name='unk_2'/>
@@ -663,11 +682,12 @@
         <int32_t since='v0.47.01'/>
 
         <compound name='interactions'>
-            <stl-vector name='unk_85'/>
+            <stl-vector type-name='int32_t' since='v0.47.01'/>
+            <stl-vector type-name='int32_t' since='v0.47.01'/>
+
+            <stl-vector name='unk_85' type-name='int32_t'/>
             <stl-vector name='unk_86'/>
 
-            <stl-vector since='v0.47.01'/>
-            <stl-vector since='v0.47.01'/>
             <stl-vector since='v0.47.01'/>
             <int32_t name='unk_1e4'/>
             <int32_t name='unk_1e8'/>
@@ -717,7 +737,7 @@
                 <int16_t name='unk_s7'/>
                 <int16_t name='unk_s8'/>
                 <int32_t name='unk_s9'/>
-                <int32_t name='unk_s10'/>
+                <int32_t name='unk_s10' since='v0.40.01'/>
             </static-array>
             <int32_t name='unk_v40_4b'/>
         </compound>
@@ -931,8 +951,8 @@
 
     <class-type type-name='adventure_item_interact_choicest'>
         <virtual-methods>
-            <vmethod><pointer/></vmethod>
-            <vmethod/>
+            <vmethod name='getDescription'><pointer type-name='stl-string'/></vmethod>
+            <vmethod name='performAction'/>
             <vmethod is-destructor='true'/>
         </virtual-methods>
     </class-type>
diff --git a/df.announcements.xml b/df.announcements.xml
index a348b0d56..7dd12caeb 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -421,10 +421,10 @@
 
         <int32_t name='repeat_count' comment='100 => displays: x101'/>
 
-        <int32_t name='unk_4410_1' since='v0.44.10'/>
+        <enum base-type='int32_t' type-name='report_zoom_type' name='zoom_type' since='v0.44.10'/>
         <compound name='pos' type-name='coord'/>
-        <int32_t name='unk_4410_2' since='v0.44.10'/>
-        <compound name='unit_pos' type-name='coord' since='v0.44.10'/>
+        <enum base-type='int32_t' type-name='report_zoom_type' name='zoom_type2' since='v0.44.10'/>
+        <compound name='pos2' type-name='coord' since='v0.44.10'/>
 
         <int32_t name='id'/>
         <int32_t name='year'/>
@@ -435,6 +435,12 @@
         <int32_t name='speaker_id' init-value='-1' since='v0.40.01' comment='unit speaking the conversation'/>
     </struct-type>
 
+    <enum-type type-name='report_zoom_type' base-type='int32_t'>
+        <enum-item name='Generic'/>
+        <enum-item name='Item'/>
+        <enum-item name='Unit'/>
+    </enum-type>
+
     <struct-type type-name='popup_message'>
         <stl-string name='text'/>
 
diff --git a/df.art.xml b/df.art.xml
index 1d6da4b7c..510b927d1 100644
--- a/df.art.xml
+++ b/df.art.xml
@@ -13,7 +13,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='art_image_element_type' name='getType'/>
             <vmethod name='setID'> <int32_t name='ID' comment='race, item type, plant ID, or shape ID'/> </vmethod>
@@ -83,7 +83,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='art_image_property_type' name='getType'/>
             <vmethod is-destructor='true'/>
diff --git a/df.buildings.xml b/df.buildings.xml
index 7eee12be0..3f4a7a726 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -448,7 +448,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='bool' name='isImpassableAtCreation'
                      comment='the true set looks like things where the unit should stand aside'/>
@@ -675,7 +675,7 @@
             <flag-bit name='gather_fallen'/>
         </bitfield>
         <int32_t name='unk_v4014_1' since='v0.40.14'/>
-        <stl-vector name='unk_v43_1' since='v0.43.01'/>
+        <stl-vector name='unk_v43_1' type-name='int32_t' since='v0.43.01'/>
     </class-type>
 
     -- actual --
diff --git a/df.entities.xml b/df.entities.xml
index 60767c1e5..f5e657465 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -161,6 +161,8 @@
             <flag-bit name='seized'/>
             <flag-bit name='offended'/>
             <flag-bit name='announce' comment='display merchantintro and merchantexit'/>
+            <flag-bit name='greatly_offended'/>
+            <flag-bit name='tribute' comment='caravan is delivering tribute (not merchant caravan)'/>
         </bitfield>
         <int32_t name='import_value'/>
         <int32_t name='export_value_total'/>
@@ -350,9 +352,9 @@
         <stl-vector name='unk_v47_3' type-name='int32_t' comment="some enum?"/>
         <stl-vector name='agreement' type-name='int32_t' ref-target='agreement'/>
         <stl-vector name='unk_v47_5' type-name='int32_t' comment="boolean?"/>
-        <stl-vector name='unk_v47_6' type-name='int32_t' comment="4 byte data size seen, so not pointer"/>
-        <stl-vector name='unk_v47_7' type-name='int32_t' comment="4 byte data size seen, so not pointer"/>
-        <stl-vector name='unk_v47_8' type-name='int32_t' comment="4 byte data size seen, so not pointer"/>
+        <stl-vector name='unk_v47_6' type-name='int32_t'/>
+        <stl-vector name='unk_v47_7' type-name='int32_t'/>
+        <stl-vector name='unk_v47_8' type-name='int32_t'/>
         <int32_t name='unk_v47_9'/>
     </struct-type>
 
@@ -445,7 +447,7 @@
             <stl-vector name='instrument_type' type-name='int16_t' ref-target='itemdef_instrumentst'/>
             <stl-vector name='siegeammo_type' type-name='int16_t' ref-target='itemdef_siegeammost'/>
             <stl-vector name='tool_type' type-name='int16_t' ref-target='itemdef_toolst'/>
-            <stl-vector type-name='int16_t' since='v0.42.01'/>
+            <stl-vector type-name='int32_t' since='v0.42.01'/>
 
             <compound name='metal'>
                 <compound name='pick' type-name='material_vec_ref'/>
@@ -601,7 +603,7 @@
                     <stl-vector name='historic_events' type-name='int32_t' ref-target='history_event'/>
                     <stl-vector name='historic_events_collection' type-name='int32_t' ref-target='history_event_collection' comment="seen with war_event_collection set"/>
                     <int32_t comment="0, 1, 4 seen. Non zero seen with relation 0/1"/>
-                    <int32_t comment="0-3 seen. Non zero seen with relation 3/4"/>
+                    <enum base-type='int32_t' type-name='season' name='tribute_season'/>
                 </pointer>
             </stl-vector>
 
@@ -683,8 +685,8 @@
         <pointer name='unk_v47_1' since='v0.47.01'>
             <stl-vector name='unk_v47_1' pointer-type='entity_unk_v47_1'/>
             <stl-vector name='foiled_plot_agreements' type-name='int32_t' ref-target='agreement' comment="Mostly a guess. The foiled plot agreement out of 2 appeared here"/>
-            <stl-vector name='unk_v47_3'/>
-            <int32_t name='unk_v47_4' comment="0 and 1 seen, so might be boolean"/>
+            <stl-vector name='unk_v47_3' type-name='int32_t'/>
+            <int32_t name='unk_v47_4' comment="0 and 1 seen, but definitely int32"/>
         </pointer>
 
         <stl-vector name='divination_sets' type-name='int32_t' since='v0.47.01' comment="Guess. Only on religions, but not all. start at 350 and added sequentially in Religion formation order. Last religion # = last divination set index"/>
@@ -698,10 +700,10 @@
             <int16_t name='unk47' comment='in 0.23, last communicate season'/>
             <int32_t name='unk48' comment='in 0.23, last communicate year'/>
 
-            <int32_t name='unk49a' comment='in 0.23, imports'/>
-            <int32_t name='unk49b' comment='in 0.23, exports'/>
-            <int32_t name='unk49c' comment='in 0.23, recent offerings'/>
-            <static-array name='unk49d' count='10' type-name='int32_t' comment='in 0.23, offerings history'/>
+            <int32_t name='imports_from'/>
+            <int32_t name='offerings_from'/>
+            <int32_t name='offerings_recent' comment='since the last migrant wave or diplomat visit'/>
+            <static-array name='offerings_history' count='10' type-name='int32_t' comment='rotated yearly at 15th of Timber'/>
             <int32_t name='unk49e' comment='in 0.23, hostility level - determined siege size, had a chance to reset to 1'/>
             <int32_t name='unk49f' comment='in 0.23, determined siege size'/>
             <int32_t since='v0.40.01'/>
@@ -1326,8 +1328,8 @@
             <pointer>
                 <int32_t/>
                 <int32_t/>
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='year'/>
+                <int32_t name='tick'/>
             </pointer>
         </stl-vector>
     </struct-type>
diff --git a/df.entity-raws.xml b/df.entity-raws.xml
index 782752f82..8fa8ddaba 100644
--- a/df.entity-raws.xml
+++ b/df.entity-raws.xml
@@ -251,7 +251,7 @@
             <static-array name='start_biome' type-name='int8_t' count='51' index-enum='biome_type'/>
             <static-array name='settlement_biome' type-name='int8_t' count='51' index-enum='biome_type'/>
 
-            <static-array name='active_season' type-name='int8_t' count='4'/>
+            <static-array name='active_season' type-name='int8_t' count='4' index-enum='season'/>
 <!--        </compound> -->
 
         <compound name='progress_trigger'>
diff --git a/df.globals.xml b/df.globals.xml
index ab1057147..94177feb3 100644
--- a/df.globals.xml
+++ b/df.globals.xml
@@ -202,9 +202,15 @@
 
     -- .bss primitive
 
-    <global-object name='version' type-name='int32_t'/>
-    <global-object name='min_load_version' type-name='int32_t'/>
-    <global-object name='movie_version' type-name='int32_t'/>
+    <global-object name='version'>
+        <enum base-type='int32_t' type-name='save_version'/>
+    </global-object>
+    <global-object name='min_load_version'>
+        <enum base-type='int32_t' type-name='save_version'/>
+    </global-object>
+    <global-object name='movie_version'>
+        <enum base-type='int32_t' type-name='cmv_version'/>
+    </global-object>
     <global-object name='basic_seed' type-name='int32_t'/>
 
     <global-object name='activity_next_id' type-name='int32_t'/>
@@ -256,7 +262,6 @@
     <global-object name='cur_season'>
         <enum type-name='season_type' base-type='int8_t'/>
     </global-object>
-<!--    <global-object name='cur_season' type-name='int8_t'/>-->
     <global-object name='cur_season_tick' type-name='int32_t'/>
 
     <global-object name='current_weather'>
diff --git a/df.graphics.xml b/df.graphics.xml
index d2b0ad8c0..466207716 100644
--- a/df.graphics.xml
+++ b/df.graphics.xml
@@ -11,12 +11,53 @@
         <int64_t name='quad_part'/>
     </struct-type>
 
-    <struct-type type-name='graphic'>
+    <struct-type type-name='musicsoundst'>
+        <int32_t name='soft_channel_number'/>
+        <int32_t name='song' init-value='-1' refers-to='$$._parent.mod[$]'/>
+        <bool name='music_active'/>
+        <bool name='sound_priority'/>
+        <int32_t name='sound_playing'/>
+        <bool name='on'/>
+        <pointer name='fmod_system'/>
+        <pointer name='fmod_master_channel_group'/>
+        <static-array name='mod' count='1000' type-name='fmod_sound' comment='songs'/>
+        <static-array name='samp' count='1000' type-name='fmod_sound' comment='sound effects'/>
+        <enum name='linux_sound_system'>
+            <enum-item name='ALSA'/>
+            <enum-item name='OSS'/>
+            <enum-item name='ESD'/>
+        </enum>
+    </struct-type>
+
+    <struct-type type-name='fmod_sound' original-name='fmodSound'>
+        <pointer name='sound'/>
+        <pointer name='channel'/>
+    </struct-type>
+
+    <enum-type type-name='curses_color' base-type='uint8_t'>
+        Using the color names without "dark" or "light", favoring primaries.
+        <enum-item name='Black'/>
+        <enum-item name='Blue'/>
+        <enum-item name='Green'/>
+        <enum-item name='Cyan'/>
+        <enum-item name='Red'/>
+        <enum-item name='Magenta'/>
+        <enum-item name='Yellow'/>
+        <enum-item name='White'/>
+    </enum-type>
+
+    <bitfield-type type-name='cmv_attribute' base-type='uint8_t'>
+        <flag-bit name='fg' count='3' type-name='curses_color'/>
+        <flag-bit name='bg' count='3' type-name='curses_color'/>
+        <flag-bit name='bright'/>
+    </bitfield-type>
+
+    <struct-type type-name='graphic' original-name='graphicst'>
         <long name='screenx'/>
         <long name='screeny'/>
-        <int8_t name='screenf'/>
-        <int8_t name='screenb'/>
-        <int8_t name='screenbright'/>
+        <enum name='screenf' type-name='curses_color'/>
+        <enum name='screenb' type-name='curses_color'/>
+        <bool name='screenbright'/>
 
         <pointer type-name='uint8_t' name='screen' is-array='true'/>
         <pointer type-name='long' name='screentexpos' is-array='true'/>
diff --git a/df.history.xml b/df.history.xml
index eda58bf77..cba50db58 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -83,6 +83,13 @@
         <enum-item name='visitor' comment="'visited' as last movement seems to be the key"/>
     </enum-type>
 
+    <enum-type type-name='season' base-type='int8_t'>
+        <enum-item name='Spring'/>
+        <enum-item name='Summer'/>
+        <enum-item name='Autumn'/>
+        <enum-item name='Winter'/>
+    </enum-type>
+
     <!-- This enum is very tentative -->
     <enum-type type-name='death_condition_type' base-type='int8_t'>
         <enum-item name='no_statement' comment="alive or dead, but death conditions not registered here"/>
@@ -146,6 +153,7 @@
             <stl-vector>
                 <enum base-type='int16_t' type-name='sphere_type'/>
             </stl-vector>
+            <stl-vector type-name='int32_t' since='v0.47.01'/>
         </pointer>
 
         <pointer name="skills">
@@ -161,8 +169,8 @@
             only a guess since most of figures have 102 (STANDARD); some have stuff like CLERK, SCOUT, BEAST_HUNTER, etc
             <enum base-type='int16_t' name='profession' type-name='profession'/>
             <int32_t since='v0.44.01'/>
-            <int32_t since='v0.47.02'/>
-            <pointer name='employment_held' since='v0.47.02'>
+            <int32_t since='v0.47.01'/>
+            <pointer name='employment_held' since='v0.47.01'>
                 <stl-vector name='employment'>
                     <pointer>
                         <int32_t name='employer' ref-target='historical_entity'/>
@@ -190,8 +198,8 @@
         <pointer name="masterpieces">
             <stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
             <stl-vector name="events2" type-name='int32_t' ref-target='history_event' comment='ones that were stolen or destroyed?'/>
-            <stl-vector name='unk_v43_1' type-name='int32_t' since='v0.43.01'/>
-            <stl-vector name='unk_v43_2' type-name='int16_t' since='v0.43.01'/>
+            <stl-vector name='unk_v43_1' type-name='int32_t' since='v0.42.06'/>
+            <stl-vector name='unk_v43_2' type-name='int16_t' since='v0.42.06'/>
         </pointer>
 
        <!-- This pointer contents is tentative -->
@@ -201,16 +209,16 @@
             <int32_t name="region_id" ref-target='world_region'/>
             <int32_t name="underground_region_id" ref-target='world_underground_region'/>
             <int32_t name="army_id" ref-target='army'/>
-            <int32_t comment="uninitialized?"/>
             <int32_t init-value='-1'/>
-            <int32_t comment="this value and the next one seem to always have the same values for the same site. Cannot find any match for them, though"/>
-            <int32_t name='unk_1'/>
-            <compound name='region' type-name='coord2d'/>
+            <int32_t init-value='-1'/>
+            <int32_t init-value='-1' comment="this value and the next one seem to always have the same values for the same site. Cannot find any match for them, though"/>
+            <int32_t init-value='-1'/>
+            <int32_t/>
             <enum name='death_condition' type-name='death_condition_type' base-type='int8_t'/>
-            <int32_t name='death_condition_parameter_1' comment="-1/site     /?/region_id/?/site     /site"/>
-            <int32_t name='death_condition_parameter_2' comment="-1/structure/?/-1       /?/structure/structure"/>
-            <int32_t name='year' since='v0.42.01' comment="time of arrival at site/region_id, not time of death"/>
-            <int32_t name='year_tick' since='v0.42.01'/>
+            <int32_t name='death_condition_parameter_1' init-value='-1' comment="-1/site     /?/region_id/?/site     /site"/>
+            <int32_t name='death_condition_parameter_2' init-value='-1' comment="-1/structure/?/-1       /?/structure/structure"/>
+            <int32_t name='year' since='v0.42.01' init-value='-1' comment="time of arrival at site/region_id, not time of death"/>
+            <int32_t name='year_tick' since='v0.42.01' init-value='-1'/>
         </pointer>
 
         <pointer name="kills" type-name='historical_kills'/>
@@ -227,25 +235,39 @@
             </stl-bit-vector>
             <int32_t name='unk_1'/>
             <int32_t name='unk_2'/>
-            <int32_t name='unk_3' since='v0.40.17-19'/>
+            <int32_t name='unk_3' since='v0.40.19'/>
         </pointer>
 
         <pointer name='known_info' since='v0.34.01'>
             <stl-vector name='known_secrets' pointer-type='interaction' comment="Interactions inflicted upon the figure through an I_SOURCE:SECRET means are recorded here; this appears to prevent the interaction from affecting the figure again on subsequent exposure (when rereading a necromancy slab, for example). For interactions with both I_SOURCE:SECRET and another source (I_SOURCE:INGESTION, for example), exposure to the interaction through the non-secret route does not result in the interaction being listed here."/>
             <int32_t name='unk_10' init-value='-1' comment="All are gods with the DEATH sphere having created slabs, but the value isn't the id of the slab"/>
-            <stl-vector name='known_written_contents' type-name='int32_t' ref-target='written_content' comment="ID of written_contents known to the historical figure. Aside from the contents of read books, these so-called written contents also include known derivations of poetic forms, dance forms and musical forms"/>
+            <stl-vector name='known_written_contents' type-name='int32_t' ref-target='written_content' comment="ID of written_contents known to the historical figure. Aside from the contents of read books, these so-called written contents also include known derivations of poetic forms, dance forms and musical forms" since='v0.42.01'/>
             <stl-vector name="known_identities" type-name='int32_t' ref-target='identity' comment="identity ID of identities known to the historical figure, such as demon true names"/>
             <stl-vector name='unk_1'>
                 <pointer>
-                    <int32_t name='unk_1'/>
-                    <int32_t name='unk_2'/>
-                    <int32_t name='unk_3'/>
-                    <int32_t name='unk_4'/>
-                    <int32_t name='unk_5'/>
-                    <int32_t name='unk_6'/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
+                    <int32_t since='v0.47.01'/>
                 </pointer>
             </stl-vector>
-            <stl-vector name ='known_events' pointer-type='entity_event'/>
+            <stl-vector name='known_events' pointer-type='entity_event'/>
             <stl-vector name='unk_4' type-name='int32_t'/>
             <stl-vector name='unk_5' type-name='int32_t'/>
             <stl-vector name='unk_6' type-name='int32_t' comment="same length as next vector. Some are definitely entities (e.g. player fortress or attacker site government), but others make no such sense"/>
@@ -258,15 +280,14 @@
                     <stl-vector name='unk_3' type-name='int32_t'/>
                     <stl-vector name='unk_4' type-name='int32_t'/>
                     <stl-vector name='unk_5' type-name='int32_t'/>
+
+                    <int32_t since='v0.42.01'/>
                 </pointer>
             </stl-vector>
-<!--
-            <stl-vector name='read_books' pointer-type='written_content'/>
--->
             <stl-vector name="known_poetic_forms" type-name='int32_t' ref-target='poetic_form' since='v0.42.01'/>
             <stl-vector name="known_musical_forms" type-name='int32_t' ref-target='musical_form' since='v0.42.01'/>
             <stl-vector name="known_dance_forms" type-name='int32_t' ref-target='dance_form' since='v0.42.01'/>
-            <pointer name="knowledge">
+            <pointer name="knowledge" since='v0.42.01'>
                 <bitfield type-name='knowledge_scholar_flags_0' name='philosophy'/>
                 <bitfield type-name='knowledge_scholar_flags_1' name='philosophy2'/>
                 <bitfield type-name='knowledge_scholar_flags_2' name='math'/>
@@ -281,8 +302,7 @@
                 <bitfield type-name='knowledge_scholar_flags_11' name='medicine3'/>
                 <bitfield type-name='knowledge_scholar_flags_12' name='engineering'/>
                 <bitfield type-name='knowledge_scholar_flags_13' name='engineering2'/>
-                <uint16_t name='knowledge_goal_category'/>
-                <uint16_t name='unk_1'/>
+                <uint32_t name='knowledge_goal_category'/>
                 <uint32_t name='unk_2'/>
                 <uint32_t name='unk_3'/>
                 <uint32_t name='unk_4'/>
@@ -290,7 +310,7 @@
                     <flag-bit name='unk0'/>
                 </bitfield>
                 <uint32_t name='research_points' comment='research is finished at 100k? amount gained depends on skills, attributes'/>
-                <uint16_t name='times_pondered' comment='one per ponder no matter what. turns into research_points somewhere around 40-60.'/>
+                <uint32_t name='times_pondered' comment='one per ponder no matter what. turns into research_points somewhere around 40-60.'/>
             </pointer>
             <pointer name='belief_systems' comment="found in prophets; contains the ID of the belief system developed by that particular prophet">
                 <stl-vector name='unk_1' type-name='int32_t' ref-target='belief_system'/>
@@ -308,7 +328,7 @@
                     </pointer>
                 </stl-vector>
             </pointer>
-            <stl-vector name='unk_3'/>
+            <stl-vector name='unk_3' type-name='int32_t' since='v0.47.01'/>
         </pointer>
 
         <pointer name='curse' since='v0.34.01'>
@@ -334,15 +354,15 @@
             <int32_t name="root_body_part_id" comment='ID of the root body part in the corpse or corpse piece which was reanimated to produce undead historical figure'/>
             <stl-string name="undead_name" comment='display name of reanimated creatures in legends mode'/>
             <int32_t name="unk_fc"/>
-            <pointer name='unk_1'>
-                <int32_t name='unk_1'/>
-                <int32_t name='unk_2'/>
-                <int32_t name='unk_3'/>
-                <int32_t name='unk_4'/>
-                <int32_t name='unk_5'/>
-                <int32_t name='unk_6'/>
+            <pointer name='unk_1' since='v0.47.01'>
+                <stl-vector type-name='int32_t'/>
+                <stl-vector type-name='int32_t'/>
+                <stl-vector type-name='int32_t'/>
+                <stl-vector type-name='int32_t'/>
+                <stl-vector type-name='int32_t'/>
+                <int32_t/>
             </pointer>
-            <pointer name='experiments'>
+            <pointer name='experiments' since='v0.47.01'>
                 <stl-vector name='unk_1' type-name='int32_t'/>
                 <stl-vector name='races' type-name='int32_t' comment='contains IDs of races created by the historical figure through experimentation'/>
             </pointer>
@@ -361,7 +381,15 @@
                 <flag-bit/>
             </bitfield>
             <int16_t name='unk_5' since='v0.44.06' comment='not saved'/>
-            <int32_t name='unk_6' since='v0.47.01' comment="doesn't seem to be initialized"/>
+            <pointer name='unk_6' since='v0.47.01'>
+                <stl-vector>
+                    <pointer>
+                        <int32_t/>
+                        <int32_t/>
+                    </pointer>
+                </stl-vector>
+                <int32_t/>
+            </pointer>
         </pointer>
 
         <pointer name='reputation' since='v0.34.01'>
@@ -376,14 +404,16 @@
                         <int32_t name="unsolved_murders"/>
                         there's an unused dword here on 64-bit
                     </compound>
-                    <int32_t name='unk_1'/>
-                    <int32_t name='unk_2'/>
-                    <int32_t name='unk_3' init-value='-1'/>
+                    <int32_t name='unk_1' since='v0.47.01'/>
+                    <int32_t name='unk_2' init-value='-1' since='v0.47.01'/>
+                    <int32_t name='unk_3' since='v0.47.01'/>
                 </pointer>
             </stl-vector>
-            <stl-vector name='unk_1'> same exact struct as above
+            <stl-vector name='unk_1'> different from above - this might be wanted.unk
                 <pointer>
                     <int32_t name='entity_id' ref-target='historical_entity'/>
+
+                    Constructor and save/load code handles the following 5 fields as if they were a compound, separate from the integer above
                     <stl-vector type-name='int32_t'/>
                     <stl-vector type-name='int32_t'/>
                     <int32_t name="discovered_year"/>
@@ -394,7 +424,7 @@
             <int32_t name="cur_identity" ref-target='identity'/>
             <stl-vector name="all_identities" type-name='int32_t' ref-target='identity'/>
             <int32_t name='next_identity_idx'/>
-            <pointer name='unk_2c'>
+            <pointer name='unk_2c' since='v0.44.01'>
                 <int32_t name='unk_1'/>
                 <int32_t name='unk_2'/>
                 <int32_t name='unk_3'/>
@@ -416,7 +446,7 @@
                         <int32_t name='unk_6'/>
                     </pointer>
                 </stl-vector>
-                <stl-vector name='unk_13' type-name='int32_t'/>
+                <stl-vector name='unk_13' type-name='int32_t' since='v0.44.01'/>
             </pointer>
         </pointer>
 
@@ -424,13 +454,13 @@
             <stl-vector name='hf_visual'>
                 <pointer>
                     <int32_t name='histfig_id' ref-target='historical_figure'/>
-                    <bool name='information_source'/>
+                    <int32_t name='information_source'/>
                     <stl-vector name='unk_2v' type-name='int32_t'/>
                     <stl-vector name="attitude">
                         <enum type-name='reputation_type' comment="Probably ordered"/>
                     </stl-vector>
                     <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element. Guess 0 - 100"/>
-                    <int32_t name='rank' init-value='65535' comment="seems to be fixed. Might not be used anymore"/>
+                    <int16_t name='rank' init-value='65535' comment="seems to be fixed. Might not be used anymore" since='v0.47.01'/>
                     <int32_t name='loyalty' comment="0 - 100. Loyalty, Respect, Fear, and Trust values do not seem to affect the relationship screen description, only Love and Familiarity"/>
                     <int32_t name='respect' comment="-100 - 100"/>
                     all 0xfff0bdc0 = -1000000
@@ -440,17 +470,17 @@
                     <int32_t name='familiarity' comment="Shifts from 'Passing' to 'Long-term' Acquaintance at 30, but a Love value other than Acquaintance takes presedence. Higher Familiarity is sorted above lower, with lower histfig_id is sorted above higher on a tie"/>
                     <int32_t name='last_meet_year' comment="probably latest contact. Seen -1"/>
                     <int32_t name='last_meet_seconds72'/>
-                    <int32_t name='meet_count'/>
-                    <int32_t name='unk_2'/>
-                    <int32_t name='unk_3'/>
-                    <int32_t name='unk_4' comment='probably uninitialized'/>
-                    <int32_t name='unk_5' comment='probably uninitialized'/>
-                    <int32_t name='unk_6' comment='probably uninitialized'/>
-                    <int32_t name='unk_7' comment='probably uninitialized'/>
-                    <int32_t name='unk_8' comment='only seen 0'/>
-                    <int32_t name='unk_9' comment='only seen 0'/>
-                    <int32_t name='first_year' comment="pair less than or equal to year. Guessing it's first contact"/>
-                    <int32_t name='first_year_tick'/>
+                    <int32_t name='meet_count' since='v0.44.10'/>
+                    <int32_t name='unk_2 since='v0.44.10''/>
+                    <int32_t name='unk_3' since='v0.44.10'/>
+                    <int32_t name='unk_4' since='v0.47.01'/>
+                    <int32_t name='unk_5' since='v0.47.01'/>
+                    <int32_t name='unk_6' since='v0.47.01'/>
+                    <int32_t name='unk_7' since='v0.47.01'/>
+                    <int32_t name='unk_8' comment='only seen 0' since='v0.47.01'/>
+                    <int32_t name='unk_9' comment='only seen 0' since='v0.47.01'/>
+                    <int32_t name='first_year' comment="pair less than or equal to year. Guessing it's first contact" since='v0.47.01'/>
+                    <int32_t name='first_year_tick' since='v0.47.01'/>
                 </pointer>
             </stl-vector>
 <!--        Entries with a 'rank' value of zero are suppressed from display. Display order seems to depend on
@@ -472,11 +502,11 @@
                     <stl-vector name='unk_1' type-name='int32_t'/>
                     <stl-vector name='unk_2' type-name='int32_t'/>
                     <stl-vector name='unk_3' type-name='int32_t'/>
-                    <int32_t name='loyalty' comment="0 - 100"/>
-                    <int32_t name='respect' comment="-100 - 100"/>
-                    <int32_t name='fear' comment="-100 - 100"/>
-                    <int32_t name='love' comment="-100 - 100"/>
-                    <int32_t name='trust' comment="-100 - 100"/>
+                    <int32_t name='loyalty' comment="0 - 100" since='v0.47.01'/>
+                    <int32_t name='respect' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='fear' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='love' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='trust' comment="-100 - 100" since='v0.47.01'/>
                 </pointer>
             </stl-vector>
             <stl-vector name='unk_1' since='v0.44.01'>
@@ -484,6 +514,12 @@
                     <int32_t name='unk_1'/>
                     <stl-vector name='unk_2' type-name='int32_t'/>
                     <stl-vector name='unk_3' type-name='int32_t'/>
+                    guessing these are the same 5 fields as above, since they have the same version threshold
+                    <int32_t name='loyalty' comment="0 - 100" since='v0.47.01'/>
+                    <int32_t name='respect' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='fear' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='love' comment="-100 - 100" since='v0.47.01'/>
+                    <int32_t name='trust' comment="-100 - 100" since='v0.47.01'/>
                 </pointer>
             </stl-vector>
             <stl-vector name='identities' type-name='int32_t' ref-target='cultural_identity'/>
@@ -525,7 +561,7 @@
                             <enum-item name='Infiltrate_Society'/>
                         </enum>
                         <int32_t name='parameter' init-value='-1' comment="0/3/5:local_id, 2:artifact_id, 7/8/9/10/11:actor_id, 12/15:entity_id, 1/4:not seen"/>
-                        <bool name='on_hold'/>
+                        <int32_t name='on_hold'/>
                         <stl-vector name='plot_agreements' pointer-type='plot_agreement'/>
                         <compound name='plot_data' is-union='true'>
                             <pointer name='None' comment="seems uninitialized"/>
@@ -588,9 +624,35 @@
                 </stl-vector>
                 <int32_t name='next_intrigue_id'/>
                 <stl-vector name='unk11' type-name='int32_t' comment="4 bytes allocated observed, which cant' host a pointer"/>
-                <stl-vector name='unk12'/>
+                <stl-vector name='unk12'>
+                    <pointer>
+                        <int32_t/>
+                        <int32_t name='unk_4'/>
+                        <int32_t/>
+                        <compound name='unk_data' is-union='true'> based on unk_4
+                            <pointer name='ptr_0'>
+                                <int32_t/>
+                                <int32_t/>
+                                <int32_t/>
+                                <int32_t/>
+                            </pointer>
+                            <pointer name='ptr_1'>
+                                <int32_t/>
+                                <int32_t/>
+                                <int32_t/>
+                            </pointer>
+                            <pointer name='ptr_2'>
+                            </pointer>
+                            <pointer name='ptr_3'/>
+                                this one has ANOTHER union inside it, sized at 11 32-bit integers and having 6 subtypes
+                                followed by another 3 integers
+                        </compound>
+                    </pointer>
+                </stl-vector>
                 <int32_t name='unk13'/>
-                <stl-vector name='unk14'/>
+                <stl-vector name='unk14'>
+                    <pointer/> - this is the same 6-subtype 11-integer union seen immediately above in ptr_3
+                </stl-vector>
                 <int32_t name='unk15'/>
                 <int32_t name='unk16' init-value='-1'/>
                 <int32_t name='unk17' init-value='-1'/>
@@ -904,7 +966,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -974,7 +1036,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -1688,7 +1750,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod comment='records event in historical_entity.unknown1b.diplomacy in both directions if applicable'/>
             <vmethod is-destructor='true'/>
@@ -1883,9 +1945,18 @@
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
-        <df-flagarray name='flags2'/>
+        <df-flagarray name='flags2' index-enum='history_event_merchant_flags'/>
     </class-type>
 
+    <enum-type type-name='history_event_merchant_flags'>
+        <enum-item name='vanished' comment='opposite of communicate in caravan_state'/>
+        <enum-item name='hardship'/>
+        <enum-item name='seized'/>
+        <enum-item name='offended'/>
+        <enum-item name='missing_goods'/>
+        <enum-item name='tribute'/>
+    </enum-type>
+
     <class-type type-name='history_event_artifact_hiddenst' inherits-from='history_event'>
         <int32_t name='artifact' ref-target='artifact_record'/>
         <int32_t name='unit' ref-target='unit'/>
@@ -2213,7 +2284,7 @@
         <int32_t name='defender_civ' ref-target='historical_entity'/>
         <int32_t name='site_civ' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
-        <enum name='season' type-name='season_type' base-type='int8_t'/>
+        <enum name='season' type-name='season_type' base-type='int32_t'/>
         <bitfield name='tribute_flags' base-type='uint32_t'>
             <flag-bit name='bled_dry' comment='tribute was demanded, but not received'/>
         </bitfield>
@@ -3183,7 +3254,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod name='categorize'/>
 
diff --git a/df.interaction.xml b/df.interaction.xml
index b732b2e06..e032906d6 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -32,6 +32,12 @@
         <enum-item name='CONTACT'/>
         <enum-item name='MATERIAL_EMISSION'/>
         <enum-item name='HIDE'/>
+        <enum-item name='PROPEL_UNIT'/>
+        <enum-item name='SUMMON_UNIT'/>
+        <enum-item name='CHANGE_WEATHER'/>
+        <enum-item name='RAISE_GHOST'/>
+        <enum-item name='CREATE_ITEM'/>
+        <enum-item name='CHANGE_ITEM_QUALITY'/>
     </enum-type>
 
     <enum-type type-name='interaction_effect_location_hint' base-type='int32_t'>
@@ -57,18 +63,27 @@
 
         <virtual-methods>
             <vmethod ret-type='interaction_effect_type' name='getType'/>
-            <vmethod name='write_file'> <pointer comment='file_compressorst'/> </vmethod>
+            <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
-                <pointer comment='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <pointer name='file' type-name='file_compressorst'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
-            <vmethod><int32_t/><int32_t/><int32_t/></vmethod>
+            <vmethod name='activateOnUnit'>
+                <pointer name='target' type-name='unit'/>
+                <pointer comment='has pointer-vector at offset 0x10'/>
+                <bool comment='only used by animate'/>
+            </vmethod>
+            <vmethod name='activateOnItem'><pointer name='target' type-name='item'/></vmethod>
             <vmethod name='parseRaws'><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/></vmethod>
             <vmethod name='finalize'><int32_t/></vmethod>
-            <vmethod/>
-            <vmethod><int32_t/><int32_t/></vmethod>
-            <vmethod ret-type='bool'><int32_t/></vmethod>
+            <vmethod name='applySyndromes'/>
+            <vmethod>
+                <pointer/>
+                <pointer/>
+                <bool/>
+            </vmethod>
+            <vmethod name='hasSyndrome' ret-type='bool'><pointer type-name='syndrome'/></vmethod>
         </virtual-methods>
     </class-type>
 
@@ -115,6 +130,11 @@
         <int32_t/>
     </class-type>
 
+    <class-type type-name='interaction_effect_raise_ghostst' inherits-from='interaction_effect'>
+        <int32_t/>
+        <stl-vector name='syndrome' pointer-type='syndrome' comment='assumed based on vmethod reference'/>
+    </class-type>
+
     <class-type type-name='interaction_effect_create_itemst' inherits-from='interaction_effect'>
         <enum name='item_type' type-name='item_type' comment='IE_ITEM'/>
         <int16_t name='item_subtype' comment='IE_ITEM'/>
@@ -162,6 +182,7 @@
         <enum-item name='INGESTION'/>
         <enum-item name='CREATURE_ACTION'/>
         <enum-item name='UNDERGROUND_SPECIAL'/>
+        <enum-item name='EXPERIMENT'/>
     </enum-type>
 
     <class-type type-name='interaction_source' original-name='interaction_sourcest' key-field='id'>
@@ -180,10 +201,10 @@
 
         <virtual-methods>
             <vmethod ret-type='interaction_source_type' name='getType'/>
-            <vmethod name='write_file'> <pointer comment='file_compressorst'/> </vmethod>
+            <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
-                <pointer comment='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <pointer name='file' type-name='file_compressorst'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod name='parseRaws'><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/></vmethod>
@@ -293,10 +314,10 @@
         <int32_t name='reference_distance' comment='IT_LOCATION:RANDOM_NEARBY_LOCATION'/>
         <virtual-methods>
             <vmethod ret-type='interaction_target_type' name='getType'/>
-            <vmethod name='write_file'> <pointer comment='file_compressorst'/> </vmethod>
+            <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
-                <pointer comment='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <pointer name='file' type-name='file_compressorst'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod name='parseRaws'><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/></vmethod>
diff --git a/df.itemimprovements.xml b/df.itemimprovements.xml
index 9878643bb..8ce8cebcb 100644
--- a/df.itemimprovements.xml
+++ b/df.itemimprovements.xml
@@ -13,6 +13,7 @@
         <enum-item name="ILLUSTRATION"/>
         <enum-item name="INSTRUMENT_PIECE"/>
         <enum-item name="WRITING"/>
+        <enum-item name="IMAGE_SET"/>
     </enum-type>
 
     <struct-type type-name='dye_info'>
@@ -50,7 +51,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
 
             <vmethod ret-type='improvement_type' name='getType'/>
@@ -127,6 +128,10 @@
         <stl-vector name='contents' type-name='int32_t' ref-target='written_content'/>
     </class-type>
 
+    <class-type type-name='itemimprovement_image_setst' inherits-from='itemimprovement'>
+        <int32_t init-value='-1'/>
+    </class-type>
+
     <enum-type type-name='written_content_type' base-type='int32_t'>
         <enum-item name='Manual'/>
         <enum-item name='Guide'/>
diff --git a/df.items.xml b/df.items.xml
index 1239ad4d4..517d1855c 100644
--- a/df.items.xml
+++ b/df.items.xml
@@ -448,7 +448,7 @@
 
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod name='getWeaponAttacks'>
                 <ret-type><pointer><stl-vector type-name='pointer'/></pointer></ret-type>
diff --git a/df.machines.xml b/df.machines.xml
index 822d34448..3c8d82ec3 100644
--- a/df.machines.xml
+++ b/df.machines.xml
@@ -71,7 +71,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.map.xml b/df.map.xml
index 1f6b12adc..24a9416d0 100644
--- a/df.map.xml
+++ b/df.map.xml
@@ -341,7 +341,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
         </virtual-methods>
     </class-type>
@@ -362,7 +362,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
         </virtual-methods>
     </class-type>
@@ -424,7 +424,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='bool' name='isEmpty'/>
             <vmethod is-destructor='true'/>
@@ -563,7 +563,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod><int32_t/><int32_t/><int32_t/></vmethod>
             <vmethod/>
@@ -615,10 +615,14 @@
 
         <virtual-methods>
             <vmethod ret-type='feature_type' name='getType'/>
-            <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> <int32_t/> </vmethod>
+            <vmethod name='write_file'>
+                <pointer name='file' type-name='file_compressorst'/>
+                <bool name='include_feature'/>
+            </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/> <int32_t/>
+                <enum name='loadversion' type-name='save_version'/>
+                <bool name='include_feature'/>
             </vmethod>
             <vmethod name='createFeature'>
                 <ret-type><pointer type-name='feature'/></ret-type>
@@ -721,7 +725,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -759,7 +763,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -802,7 +806,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -944,7 +948,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod><pointer type-name='flow_info'/></vmethod>
             <vmethod is-destructor='true'/>
@@ -986,7 +990,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='bool'/>
             <vmethod is-destructor='true'/>
diff --git a/df.meeting.xml b/df.meeting.xml
index 4e5483c84..cbcd4d498 100644
--- a/df.meeting.xml
+++ b/df.meeting.xml
@@ -119,7 +119,10 @@
                 <pointer name='ref_value' type-name='specific_ref'/>
             </vmethod>
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
-            <vmethod name='read_file'> <pointer name='file' type-name='file_compressorst'/> <int32_t name='load_version'/> </vmethod>
+            <vmethod name='read_file'>
+                <pointer name='file' type-name='file_compressorst'/>
+                <enum name='loadversion' type-name='save_version'/>
+            </vmethod>
         </virtual-methods>
     </class-type>
 
@@ -364,7 +367,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='bool' name='isEmpty'
@@ -839,7 +842,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
         </virtual-methods>
     </class-type>
diff --git a/df.military.xml b/df.military.xml
index b274e8326..b4f9cfa24 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -251,7 +251,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='squad_order_type' name='getType'/>
             <vmethod name='isPatrol' ret-type='bool'/> whether or not dwarves get unhappy while doing this
diff --git a/df.projectile.xml b/df.projectile.xml
index 67f57000c..31b1b60a9 100644
--- a/df.projectile.xml
+++ b/df.projectile.xml
@@ -74,7 +74,7 @@
             <vmethod ret-type='bool' name='checkMovement'/>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod>
diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
index 00ba20aae..e3c1574de 100644
--- a/df.reaction-raws.xml
+++ b/df.reaction-raws.xml
@@ -39,10 +39,10 @@
         <stl-vector name="raw_strings" pointer-type='stl-string' since='v0.42.01'/>
         <stl-string name="category" since='v0.42.01'/>
         <stl-vector name="descriptions" pointer-type='reaction_description' since='v0.42.01'/>
-        <int32_t since='v0.47.02'/>
-        <int32_t since='v0.47.02'/>
-        <int32_t since='v0.47.02'/>
-        <int32_t since='v0.47.02'/>
+        <int32_t name='quality_adj1' since='v0.47.02' init-value='11'/>
+        <int32_t name='quality_adj2' since='v0.47.02' init-value='5'/>
+        <int32_t since='v0.47.02' init-value='10'/>
+        <int32_t name='exp_gain' since='v0.47.02' init-value='30'/>
     </struct-type>
 
     <struct-type type-name='reaction_category'>
@@ -147,17 +147,17 @@
                 <int32_t name='reactionID'/>
             </vmethod>
             <vmethod name='produce'>
-                <pointer type-name='unit'/>
+                <pointer name='maker' type-name='unit'/>
                 <pointer name='out_products'><stl-vector pointer-type='reaction_product'/></pointer>
                 <pointer name='out_items'><stl-vector pointer-type='item'/></pointer>
                 <pointer name='in_reag'><stl-vector pointer-type='reaction_reagent'/></pointer>
                 <pointer name='in_items'><stl-vector pointer-type='item'/></pointer>
                 <int32_t name='quantity'/>
-                <enum type-name='job_skill' base-type='int16_t'/>
-                <pointer type-name='historical_entity'/>
-                <int32_t name='unk1' />
-                <pointer type-name='world_site'/>
-                <pointer name='unk2' />
+                <enum name='skill' type-name='job_skill' base-type='int16_t'/>
+                <int32_t name='job_quality' comment='gets +10 for matching preferences, uses cutoffs 23/30/35/45/55 for Well/Fine/Superior/Exceptional/Masterwork'/>
+                <pointer name='entity' type-name='historical_entity'/>
+                <pointer name='site' type-name='world_site'/>
+                <pointer name='unk4' comment='only used when making improvements'><stl-vector type-name='pointer'/></pointer>
             </vmethod>
             <vmethod name='getDescription' comment='used in Adventurer mode reactions?'>
                 <pointer type-name='stl-string' name='desc'/>
diff --git a/df.refs.xml b/df.refs.xml
index 77db58a18..3ce1a80d9 100644
--- a/df.refs.xml
+++ b/df.refs.xml
@@ -81,7 +81,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod ret-type='general_ref_type' name='getType'/>
             <vmethod name='getItem'>
@@ -456,7 +456,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod/>
             <vmethod/>
@@ -540,7 +540,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod comment='generate_xml'>
                 <pointer type-name='stl-fstream'/>
@@ -592,7 +592,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod comment='generate_xml'>
                 <pointer type-name='stl-fstream'/>
diff --git a/df.resource.xml b/df.resource.xml
index 242f33783..570f69342 100644
--- a/df.resource.xml
+++ b/df.resource.xml
@@ -62,7 +62,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index edc99c0d5..d49d11fe6 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -337,7 +337,7 @@
 
         <compound name='job_details' since='v0.42.06'>
             <pointer name='job' type-name='job'/>
-            <padding size='4'/>
+            <pointer name='order' type-name='manager_order'/>
 
             <stl-vector name='detail_type' type-name='int32_t' comment='0-material, 1-image, 2-size, 3-type'/>
             <stl-vector name='detail_material_type' type-name='int32_t'/>
diff --git a/df.ui.xml b/df.ui.xml
index 93a046b47..62e91d405 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -268,7 +268,9 @@
         <stl-vector type-name='int32_t' name='unk_races' ref-target='creature_raw' since='v0.42.01'/>
 
         <stl-vector name='farm_crops' type-name='int16_t' ref-target='plant_raw'/>
-        <stl-vector name='farm_seasons' type-name='int8_t'/>
+        <stl-vector name='farm_seasons'>
+            <enum base-type='int8_t' type-name='season'/>
+        </stl-vector>
 
         <compound name='economy_prices'>
             <compound name='price_adjustment'>
@@ -676,7 +678,7 @@
 
     <struct-type type-name='timed_event'>
         <enum type-name='timed_event_type' name='type'/>
-        <int8_t name='season'/>
+        <enum base-type='int8_t' type-name='season' name='season'/>
         <int16_t name='season_ticks' comment='1 tick = 10 frames'/>
         <pointer name='entity' type-name='historical_entity'/>
         <int16_t/>
diff --git a/df.version.xml b/df.version.xml
new file mode 100644
index 000000000..4219ad61a
--- /dev/null
+++ b/df.version.xml
@@ -0,0 +1,142 @@
+<data-definition>
+    <enum-type type-name='cmv_version' base-type='int32_t'>
+        <enum-item name='CMV_0' value='10000'/>
+        <enum-item name='CMV_1' value='10001' comment='adds support for sound'/>
+    </enum-type>
+
+    <enum-type type-name='save_version' base-type='int32_t'>
+        <enum-item name='v0_21_93_19a' value='1107'/>
+        <enum-item name='v0_21_93_19c' value='1108'/>
+        <enum-item name='v0_21_95_19a' value='1108'/>
+        <enum-item name='v0_21_95_19b' value='1108'/>
+        <enum-item name='v0_21_95_19c' value='1110'/>
+        <enum-item name='v0_21_104_19d' value='1121'/>
+        <enum-item name='v0_21_104_21a' value='1123'/>
+        <enum-item name='v0_21_104_21b' value='1125'/>
+        <enum-item name='v0_21_105_21a' value='1128'/>
+        <enum-item name='v0_22_107_21a' value='1128'/>
+        <enum-item name='v0_22_110_22e' value='1134'/>
+        <enum-item name='v0_22_110_22f' value='1137'/>
+        <enum-item name='v0_22_110_23a' value='1148'/>
+        <enum-item name='v0_22_120_23a' value='1151'/>
+        <enum-item name='v0_22_121_23b' value='1161'/>
+        <enum-item name='v0_22_123_23a' value='1165'/>
+        <enum-item name='v0_23_130_23a' value='1169'/>
+
+        <enum-item name='v0_27_169_32a' value='1205'/>
+        <enum-item name='v0_27_169_33a' value='1206'/>
+        <enum-item name='v0_27_169_33b' value='1209'/>
+        <enum-item name='v0_27_169_33c' value='1211'/>
+        <enum-item name='v0_27_169_33d' value='1212'/>
+        <enum-item name='v0_28_181_39b' value='1255'/>
+        <enum-item name='v0_28_181_39c' value='1256'/>
+        <enum-item name='v0_28_181_39d' value='1259'/>
+        <enum-item name='v0_28_181_39e' value='1260'/>
+        <enum-item name='v0_28_181_39f' value='1261'/>
+        <enum-item name='v0_28_181_40a' value='1265'/>
+        <enum-item name='v0_28_181_40b' value='1266'/>
+        <enum-item name='v0_28_181_40c' value='1267'/>
+        <enum-item name='v0_28_181_40d' value='1268'/>
+
+        <enum-item name='v0_31_01' value='1287'/>
+        <enum-item name='v0_31_02' value='1288'/>
+        <enum-item name='v0_31_03' value='1289'/>
+        <enum-item name='v0_31_04' value='1292'/>
+        <enum-item name='v0_31_05' value='1295'/>
+        <enum-item name='v0_31_06' value='1297'/>
+        <enum-item name='v0_31_08' value='1300'/>
+        <enum-item name='v0_31_09' value='1304'/>
+        <enum-item name='v0_31_10' value='1305'/>
+        <enum-item name='v0_31_11' value='1310'/>
+        <enum-item name='v0_31_12' value='1311'/>
+        <enum-item name='v0_31_13' value='1323'/>
+        <enum-item name='v0_31_14' value='1325'/>
+        <enum-item name='v0_31_15' value='1326'/>
+        <enum-item name='v0_31_16' value='1327'/>
+        <enum-item name='v0_31_17' value='1340'/>
+        <enum-item name='v0_31_18' value='1341'/>
+        <enum-item name='v0_31_19' value='1351'/>
+        <enum-item name='v0_31_20' value='1353'/>
+        <enum-item name='v0_31_21' value='1354'/>
+        <enum-item name='v0_31_22' value='1359'/>
+        <enum-item name='v0_31_23' value='1360'/>
+        <enum-item name='v0_31_24' value='1361'/>
+        <enum-item name='v0_31_25' value='1362'/>
+
+        <enum-item name='v0_34_01' value='1372'/>
+        <enum-item name='v0_34_02' value='1374'/>
+        <enum-item name='v0_34_03' value='1376'/>
+        <enum-item name='v0_34_04' value='1377'/>
+        <enum-item name='v0_34_05' value='1378'/>
+        <enum-item name='v0_34_06' value='1382'/>
+        <enum-item name='v0_34_07' value='1383'/>
+        <enum-item name='v0_34_08' value='1400'/>
+        <enum-item name='v0_34_09' value='1402'/>
+        <enum-item name='v0_34_10' value='1403'/>
+        <enum-item name='v0_34_11' value='1404'/>
+
+        <enum-item name='v0_40_01' value='1441'/>
+        <enum-item name='v0_40_02' value='1442'/>
+        <enum-item name='v0_40_03' value='1443'/>
+        <enum-item name='v0_40_04' value='1444'/>
+        <enum-item name='v0_40_05' value='1445'/>
+        <enum-item name='v0_40_06' value='1446'/>
+        <enum-item name='v0_40_07' value='1448'/>
+        <enum-item name='v0_40_08' value='1449'/>
+        <enum-item name='v0_40_09' value='1451'/>
+        <enum-item name='v0_40_10' value='1452'/>
+        <enum-item name='v0_40_11' value='1456'/>
+        <enum-item name='v0_40_12' value='1459'/>
+        <enum-item name='v0_40_13' value='1462'/>
+        <enum-item name='v0_40_14' value='1469'/>
+        <enum-item name='v0_40_15' value='1470'/>
+        <enum-item name='v0_40_16' value='1471'/>
+        <enum-item name='v0_40_17' value='1472'/>
+        <enum-item name='v0_40_18' value='1473'/>
+        <enum-item name='v0_40_19' value='1474'/>
+        <enum-item name='v0_40_20' value='1477'/>
+        <enum-item name='v0_40_21' value='1478'/>
+        <enum-item name='v0_40_22' value='1479'/>
+        <enum-item name='v0_40_23' value='1480'/>
+        <enum-item name='v0_40_24' value='1481'/>
+
+        <enum-item name='v0_42_01' value='1531'/>
+        <enum-item name='v0_42_02' value='1532'/>
+        <enum-item name='v0_42_03' value='1533'/>
+        <enum-item name='v0_42_04' value='1534'/>
+        <enum-item name='v0_42_05' value='1537'/>
+        <enum-item name='v0_42_06' value='1542'/>
+
+        <enum-item name='v0_43_01' value='1551'/>
+        <enum-item name='v0_43_02' value='1552'/>
+        <enum-item name='v0_43_03' value='1553'/>
+        <enum-item name='v0_43_04' value='1555'/>
+        <enum-item name='v0_43_05' value='1556'/>
+
+        <enum-item name='v0_44_01' value='1596'/>
+        <enum-item name='v0_44_02' value='1597'/>
+        <enum-item name='v0_44_03' value='1600'/>
+        <enum-item name='v0_44_04' value='1603'/>
+        <enum-item name='v0_44_05' value='1604'/>
+        <enum-item name='v0_44_06' value='1611'/>
+        <enum-item name='v0_44_07' value='1612'/>
+        <enum-item name='v0_44_08' value='1613'/>
+        <enum-item name='v0_44_09' value='1614'/>
+        <enum-item name='v0_44_10' value='1620'/>
+        <enum-item name='v0_44_11' value='1623'/>
+        <enum-item name='v0_44_12' value='1625'/>
+
+        <enum-item name='v0_47_01' value='1710'/>
+        <enum-item name='v0_47_02' value='1711'/>
+        <enum-item name='v0_47_03' value='1713'/>
+        <enum-item name='v0_47_04' value='1715'/>
+        <!-- LAST_SAVE_VERSION (leave this comment here for automated updates) -->
+    </enum-type>
+</data-definition>
+
+<!--
+Local Variables:
+indent-tabs-mode: nil
+nxml-child-indent: 4
+End:
+-->
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 92694d17a..75b3c73a1 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -22,6 +22,13 @@
         <enum-item name='TOFIRST'/>
     </enum-type>
 
+    <enum-type type-name='interface_push_types'>
+        <enum-item name='AS_PARENT'/>
+        <enum-item name='AS_CHILD'/>
+        <enum-item name='AT_BACK'/>
+        <enum-item name='AT_FRONT'/>
+    </enum-type>
+
     <class-type type-name='viewscreen' original-name='viewscreenst' custom-methods='true'>
         <pointer name='child' type-name='viewscreen'/>
         <pointer name='parent' type-name='viewscreen'/>
@@ -113,15 +120,15 @@
             <vmethod ret-type='int32_t' name='getMouseLCur'/>
             <vmethod ret-type='int32_t' name='getMouseRCur'/>
 
-            <vmethod> <pointer type-name='int32_t'/> <pointer type-name='int32_t'/> </vmethod>
-            <vmethod> <pointer type-name='int32_t'/> <pointer type-name='int32_t'/> </vmethod>
+            <vmethod name='getMouseLClickPos'> <pointer type-name='int32_t' name='x'/> <pointer type-name='int32_t' name='y'/> </vmethod>
+            <vmethod name='getMouseRClickPos'> <pointer type-name='int32_t' name='x'/> <pointer type-name='int32_t' name='y'/> </vmethod>
             <vmethod ret-type='int32_t' name='getListLength'/>
             <vmethod name='setListLength'> <int32_t/> </vmethod>
-            <vmethod ret-type='int32_t'/>
+            <vmethod ret-type='int32_t' name='getMouseX'/>
 
-            <vmethod ret-type='int32_t'/>
-            <vmethod ret-type='int32_t'/>
-            <vmethod ret-type='int32_t'/>
+            <vmethod ret-type='int32_t' name='getMouseY'/>
+            <vmethod ret-type='int32_t' name='getMouseXOld'/>
+            <vmethod ret-type='int32_t' name='getMouseYOld'/>
         </virtual-methods>
     </class-type>
 
@@ -208,11 +215,48 @@
 
     <class-type type-name='viewscreen_adopt_regionst' inherits-from='viewscreen'>
         <compound type-name='file_compressorst' name='compressor'/>
-        <int32_t name='cur_step'/>
+        <enum base-type='int32_t' name='cur_step'>
+            <enum-item name='OpeningFile'/>
+            <enum-item name='ProcessingRawData'/>
+            <enum-item name='AllocatingSpace'/>
+            <enum-item name='LoadingItems'/>
+            <enum-item name='LoadingBuildings'/>
+            <enum-item name='LoadingEntities'/>
+            <enum-item name='LoadingCoinInformation'/>
+            <enum-item name='LoadingMapData'/>
+            <enum-item name='LoadingCivilizedPopulations'/>
+            <enum-item name='LoadingHistory'/>
+            <enum-item name='LoadingParameters'/>
+            <enum-item name='LoadingArtifacts'/>
+            <enum-item name='LoadingActiveHistoricalFigures'/>
+            <enum-item name='LoadingSquads'/>
+            <enum-item name='LoadingFormations'/>
+            <enum-item name='LoadingActivities'/>
+            <enum-item name='LoadingInteractions'/>
+            <enum-item name='LoadingWrittenContent'/>
+            <enum-item name='LoadingIdentities'/>
+            <enum-item name='LoadingIncidents'/>
+            <enum-item name='LoadingCrimes'/>
+            <enum-item name='LoadingVehicles'/>
+            <enum-item name='LoadingArmies'/>
+            <enum-item name='LoadingArmyControllers'/>
+            <enum-item name='LoadingTrackingInformation'/>
+            <enum-item name='LoadingCulturalIdentities'/>
+            <enum-item name='LoadingAgreements'/>
+            <enum-item name='LoadingArtForms'/>
+            <enum-item name='LoadingOccupations'/>
+            <enum-item name='LoadingBeliefSystems'/>
+            <enum-item name='LoadingImageSets'/>
+            <enum-item name='LoadingDivinationSets'/>
+            <enum-item name='ClosingFile'/>
+            <enum-item name='RebuildingTemporaryInformation'/>
+            <enum-item name='PreparingGame'/>
+            <enum-item name='Failed'/>
+        </enum>
         <int32_t name='save_version'/>
         <compound type-name='world_dat_summary' name='cur_save'/>
         <compound type-name='matgloss_list' name='glosses'/>
-        <int32_t/>
+        <int32_t name='progress' comment='0..35'/>
     </class-type>
 
     <class-type type-name='viewscreen_adventure_logst' inherits-from='viewscreen'>
@@ -892,7 +936,7 @@
         <stl-vector/>
         <int32_t/>?
         <stl-vector pointer-type='nemesis_record' name='important_leader_nemesis'/>
-        <stl-vector type-name='int32_t'/>
+        <stl-vector type-name='int32_t' name='important_leader_precedence'/>
         <int32_t name='start_idx'/>
         <stl-vector name='agreements' pointer-type='meeting_event'/>
         <stl-vector name='agreement_status' type-name='int8_t'/>
@@ -946,15 +990,55 @@
     </class-type>
 
     <class-type type-name='viewscreen_export_regionst' inherits-from='viewscreen'>
-        <int32_t/>
-        <int32_t/>
-        <compound name='unk1'>
-            <stl-vector type-name='int32_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
+        <enum base-type='int32_t' name='state'>
+            <enum-item name='Initializing'/>
+            <enum-item name='PreliminaryCleaning'/>
+            <enum-item name='OffloadingUnits'/>
+            <enum-item name='OffloadingArtImages'/>
+            <enum-item name='OffloadingFile'/>
+            <enum-item name='CharacterizingRawData'/>
+            <enum-item name='SortingWorldInformation'/>
+            <enum-item name='AllocatingSpace'/>
+            <enum-item name='SavingItems'/>
+            <enum-item name='SavingBuildings'/>
+            <enum-item name='SavingEntities'/>
+            <enum-item name='SavingCoinInformation'/>
+            <enum-item name='SavingMapData'/>
+            <enum-item name='SavingCivilizedPopulations'/>
+            <enum-item name='SavingHistory'/>
+            <enum-item name='SavingParameters'/>
+            <enum-item name='SavingArtifacts'/>
+            <enum-item name='SavingActiveHistoricalFigures'/>
+            <enum-item name='SavingSquads'/>
+            <enum-item name='SavingFormations'/>
+            <enum-item name='SavingActivities'/>
+            <enum-item name='SavingInteractions'/>
+            <enum-item name='SavingWrittenContent'/>
+            <enum-item name='SavingIdentities'/>
+            <enum-item name='SavingIncidents'/>
+            <enum-item name='SavingCrimes'/>
+            <enum-item name='SavingVehicles'/>
+            <enum-item name='SavingArmies'/>
+            <enum-item name='SavingArmyControllers'/>
+            <enum-item name='SavingTrackingInfo'/>
+            <enum-item name='SavingCulturalIdentities'/>
+            <enum-item name='SavingAgreements'/>
+            <enum-item name='SavingArtForms'/>
+            <enum-item name='SavingOccupations'/>
+            <enum-item name='SavingBeliefSystems'/>
+            <enum-item name='SavingImageSets'/>
+            <enum-item name='SavingDivinationSets'/>
+            <enum-item name='ClosingFile'/>
+            <enum-item name='SynchronizingFolders'/>
+        </enum>
+        <int32_t name='progress' comment='0..40'/>
+        <compound name='units_progress'>
+            <stl-vector type-name='int32_t' name='save_file_id'/>
+            <stl-vector type-name='int16_t' name='save_file_member_idx'/>
+            <stl-vector pointer-type='unit' name='units'/>
+            <pointer type-name='unit_chunk' name='current_chunk'/>
+            <int32_t name='current_save_file_id'/>
+            <int32_t name='offloaded_units'/>
         </compound>
         <compound type-name='file_compressorst' name='compressor'/>
     </class-type>
@@ -2343,7 +2427,7 @@
         </stl-vector>
 
         advanced settings
-        <bool name='unk_2'/>
+        <bool name='start_in_advanced_mode'/>
         <bool name='in_worldgen'/>
         <int32_t name='cursor_paramset'/>
         <stl-string name='random_seed'/>
@@ -2363,7 +2447,7 @@
         <bool name='unk_21'/>
 
         create new world
-        <int16_t name='cursor_line'/>
+        <int32_t name='cursor_line'/>
 
         <int32_t name='world_size'/>
         <int32_t name='history'/>
@@ -2381,8 +2465,29 @@
         -- v0.40.01
         <stl-string name="raw_folder"/>
         <bool name="load_world_params"/> if set, the screen will "load the world params" the next tick and unset
-        <int32_t name="unk_b8"/>
-        <int32_t name="unk_bc"/>
+        <int32_t name='load_progress' comment='0..20'/>
+        <enum base-type='int32_t' name='load_state'>
+            <enum-item name='Initializing'/>
+            <enum-item name='LoadingObjectFiles'/>
+            <enum-item name='FinalizingLanguages'/>
+            <enum-item name='FinalizingDescriptors'/>
+            <enum-item name='FinalizingMaterialTemplates'/>
+            <enum-item name='FinalizingInorganics'/>
+            <enum-item name='FinalizingPlants'/>
+            <enum-item name='FinalizingTissueTemplates'/>
+            <enum-item name='FinalizingItems'/>
+            <enum-item name='FinalizingBuildings'/>
+            <enum-item name='FinalizingBodyDetailPlans'/>
+            <enum-item name='FinalizingCreatureVariations'/>
+            <enum-item name='FinalizingCreatures'/>
+            <enum-item name='FinalizingEntities'/>
+            <enum-item name='FinalizingReactions'/>
+            <enum-item name='FinalizingInteractions'/>
+            <enum-item name='PreparingMaterialData'/>
+            <enum-item name='PreparingTextObjects'/>
+            <enum-item name='PreparingGraphics'/>
+            <enum-item name='Finalizing'/>
+        </enum>
     </class-type>
 
     <class-type type-name='viewscreen_noblest' inherits-from='viewscreen'>
diff --git a/df.world-site.xml b/df.world-site.xml
index 34d6bc5b4..acb237c89 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -146,7 +146,7 @@
 
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='int32_t' name='getDeityHistfigID'/>
@@ -409,8 +409,8 @@
                 <int32_t name="unk_4"/>
                 <int32_t name="unk_8"/>
                 <int32_t name="unk_c"/>
-                <stl-vector name="unk_10"/>
-                <stl-vector name="unk_20"/>
+                <stl-vector name="unk_10" type-name="int32_t"/>
+                <stl-vector name="unk_20" type-name="int32_t"/>
                 <int32_t name="unk_30"/>
             </pointer>
         </stl-vector>
@@ -984,7 +984,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -1120,6 +1120,12 @@
         <enum base-type='int32_t' name="type" type-name='hillock_house_type'/>
     </class-type>
 
+    <class-type type-name='site_realization_building_info_shrinest'
+                inherits-from='site_realization_building_infost'>
+        <int32_t init-value='-1'/>
+        <int32_t init-value='-1'/>
+    </class-type>
+
     <enum-type type-name='creation_zone_pwg_alteration_type'>
         <enum-item name='location_death'/>
         <enum-item name='camp'/>
@@ -1134,7 +1140,7 @@
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer name='file' type-name='file_compressorst'/>
-                <int32_t name='loadversion'/>
+                <enum name='loadversion' type-name='save_version'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod><int32_t/></vmethod>
diff --git a/df.world.xml b/df.world.xml
index 77935f1a5..155f3512b 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -1284,7 +1284,20 @@
         <pointer name='world_data' type-name='world_data'/>
 
         <compound name='worldgen_status'>
-            <int16_t name='state'/>
+            <enum base-type='int16_t' name='state'>
+                <enum-item name='None' value='-1'/>
+                <enum-item name='Initializing'/>
+                <enum-item name='PreparingElevation'/>
+                <enum-item name='SettingTemperature'/>
+                <enum-item name='RunningRivers'/>
+                <enum-item name='FormingLakesAndMinerals'/>
+                <enum-item name='GrowingVegetation'/>
+                <enum-item name='VerifyingTerrain'/>
+                <enum-item name='ImportingWildlife'/>
+                <enum-item name='RecountingLegends'/>
+                <enum-item name='Finalizing'/>
+                <enum-item name='Done'/>
+            </enum>
             <int32_t name='num_rejects'/>
             <static-array count='53' type-name='int32_t'/>
             <static-array count='53' type-name='int32_t'/>
@@ -1651,16 +1664,81 @@
         <compound name='cur_savegame'>
             <stl-string name='save_dir'/>
             <int32_t name='unk_v40_0s'/> was padding
-            <int32_t name='unk_v40_1s' since='v0.40.01'/>
+            <enum base-type='int32_t' name='load_stage' since='v0.40.01'>
+                <enum-item name='LoadingObjectFiles'/>
+                <enum-item name='SortingMaterialTemplates'/>
+                <enum-item name='SortingInorganics'/>
+                <enum-item name='SortingPlants'/>
+                <enum-item name='SortingTissueTemplates'/>
+                <enum-item name='SortingItems'/>
+                <enum-item name='SortingBuildings'/>
+                <enum-item name='SortingBodyDetailPlans'/>
+                <enum-item name='SortingCreatureBodies'/>
+                <enum-item name='SortingCreatureVariations'/>
+                <enum-item name='SortingCreatures'/>
+                <enum-item name='SortingEntities'/>
+                <enum-item name='SortingLanguages'/>
+                <enum-item name='SortingDescriptions'/>
+                <enum-item name='SortingReactions'/>
+                <enum-item name='SortingInteractions'/>
+                <enum-item name='FinalizingLanguages'/>
+                <enum-item name='FinalizingDescriptors'/>
+                <enum-item name='FinalizingMaterialTemplates'/>
+                <enum-item name='FinalizingInorganics'/>
+                <enum-item name='FinalizingPlants'/>
+                <enum-item name='FinalizingTissueTemplates'/>
+                <enum-item name='FinalizingItems'/>
+                <enum-item name='FinalizingBuildings'/>
+                <enum-item name='FinalizingBodyDetailPlans'/>
+                <enum-item name='FinalizingCreatureVariations'/>
+                <enum-item name='FinalizingCreatures'/>
+                <enum-item name='FinalizingEntities'/>
+                <enum-item name='FinalizingReactions'/>
+                <enum-item name='FinalizingInteractions'/>
+                <enum-item name='PreparingMaterialData'/>
+                <enum-item name='GeneratingInorganics'/>
+                <enum-item name='GeneratingPlants'/>
+                <enum-item name='GeneratingItems'/>
+                <enum-item name='GeneratingCreatures'/>
+                <enum-item name='GeneratingEntities'/>
+                <enum-item name='GeneratingReactions'/>
+                <enum-item name='GeneratingInteractions'/>
+                <enum-item name='FinalizingGeneratedObjects'/>
+                <enum-item name='PreparingTextObjects'/>
+                <enum-item name='PreparingGraphics'/>
+                <enum-item name='Finishing'/>
+            </enum>
             <int32_t name='unk_v40_2s' since='v0.40.01'/>
         </compound>
 
-        <int32_t name='unk_v40_3s' since='v0.40.01'/>
-        <int32_t name='unk_v40_4s' since='v0.40.01'/>
+        <compound name='loading' since='v0.40.01'>
+            <enum base-type='int32_t' name='state'>
+                <enum-item name='Initializing'/>
+                <enum-item name='Languages'/>
+                <enum-item name='Shapes'/>
+                <enum-item name='Colors'/>
+                <enum-item name='Patterns'/>
+                <enum-item name='MaterialTemplates'/>
+                <enum-item name='Inorganics'/>
+                <enum-item name='Plants'/>
+                <enum-item name='TissueTemplates'/>
+                <enum-item name='Items'/>
+                <enum-item name='Buildings'/>
+                <enum-item name='BodyDetailPlans'/>
+                <enum-item name='CreatureBodies'/>
+                <enum-item name='CreatureVariations'/>
+                <enum-item name='Creatures'/>
+                <enum-item name='Entities'/>
+                <enum-item name='Reactions'/>
+                <enum-item name='Interactions'/>
+                <enum-item name='Finishing'/>
+            </enum>
+            <int32_t name='progress' comment='0..19' since='v0.40.01'/>
 
-        <stl-vector name='unk_v40_5s' since='v0.40.01' type-name='int32_t' comment="looks like it's a pointer, but the data pointed to being uninitialized"/>
+            <stl-vector name='object_files' since='v0.40.01' type-name='ptr-string'/>
+            <int32_t name='object_file_index' since='v0.40.01' refers-to='$$._parent.object_files[$]'/>
+        </compound>
 
-        <int32_t name='unk_v40_6s' since='v0.40.01'/>
         <pointer name='unk_v40_7s' comment="mutated from 0.40.01. Generates 4 bytes of padding before it on 64 bit systems followed by an 8 byte pointer, but only a 4 byte pointer on 32 bit systems"/>
 
         <compound name='features'>
diff --git a/list.pl b/list.pl
index 8798a843f..868835966 100644
--- a/list.pl
+++ b/list.pl
@@ -10,6 +10,7 @@
 my $separator = $ARGV[2] || "\n";
 
 print "$output_dir/static.inc";
+print "$separator$output_dir/global_objects.h";
 for my $file (qw(ctors enums fields)) {
     print "$separator$output_dir/static.$file.inc";
 }
@@ -25,7 +26,9 @@
         $doc->findnodes('/data-definition/enum-type'),
         $doc->findnodes('/data-definition/bitfield-type'),
         $doc->findnodes('/data-definition/struct-type'),
-        $doc->findnodes('/data-definition/class-type')
+        $doc->findnodes('/data-definition/class-type'),
+        $doc->findnodes('/data-definition/df-linked-list-type'),
+        $doc->findnodes('/data-definition/df-other-vectors-type')
     );
 
     for my $node (@nodes) {