diff --git a/changelog.txt b/changelog.txt
index 56b00106e..90e0b8297 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -39,6 +39,7 @@ that repo.
 - ``breed``: new struct type
 - ``creature_handler``: identified vmethods
 - ``crime``: removed fields of ``reports`` that are no longer present
+- ``dance_form``: identified most fields
 - ``history_event_context``: identified fields
 - ``image_set``: new struct type
 - ``itemdef_flags``: new enum, with ``GENERATED`` flag
@@ -47,6 +48,7 @@ that repo.
 - ``interrogation_report``: new struct type
 - ``justification``: new enum
 - ``lever_target_type``: identified ``LeverMechanism`` and ``TargetMechanism`` values
+- ``musical_form``: identified fields, including some renames. Also identified fields in ``scale`` and ``rhythm``
 - ``region_weather``: new struct type
 - ``squad_order_cause_trouble_for_entityst``: identified fields
 - ``unit_thought_type``: added several new thought types
diff --git a/df.art.xml b/df.art.xml
index d41ce0fdc..a58ac390f 100644
--- a/df.art.xml
+++ b/df.art.xml
@@ -482,19 +482,19 @@
         <enum-item name='Fast'/>
         <enum-item name='VeryFast'/>
         <enum-item name='ExtremelyFast'/>
-        <enum-item/>
-
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='DoubleTempo' comment="twice the tempo of the last passage"/>
+        --  10
+        <enum-item name='HalfTempo' comment="half the tempo of the previous passage"/>
+        <enum-item name='Faster' comment="more quickly than the last passage"/>
+        <enum-item name='Slower' comment="slower than the last passage"/>
+        <enum-item name='ResumeTempo' comment="resumes the previous tempo"/>
+        <enum-item name='OriginalTempo' comment="resumes the original tempo"/>
         <enum-item name='Accelerates'/>
         <enum-item name='SlowsAndBroadens'/>
         <enum-item name='ConsistentlySlowing'/>
         <enum-item name='HurriedPace'/>
         <enum-item name='GraduallySlowsAtEnd'/>
-
+        --  20
         -- dynamic styles
         <enum-item name='WhisperedUndertones'/>
         <enum-item name='VerySoft'/>
@@ -506,7 +506,7 @@
         <enum-item name='BecomeLouderAndLouder'/>
         <enum-item name='BecomeSofterAndSofter'/>
         <enum-item name='FadeIntoSilence'/>
-
+        --  30
         <enum-item name='StartLoudThenImmediatelySoft'/>
         -- more tempo styles
         <enum-item name='SlowsAndDiesAwayAtEnd'/>
@@ -519,7 +519,7 @@
         <enum-item name='BeLively'/>
         <enum-item name='BeSkilled'/>
         <enum-item name='BeVigorous'/>
-
+        --  40
         <enum-item name='BeSpirited'/>
         <enum-item name='BeDelicate'/>
         <enum-item name='BeFiery'/>
@@ -531,7 +531,7 @@
         <enum-item name='Sparkle'/>
         <enum-item name='BeBroad'/>
         <enum-item name='BeMadeSweetly'/>
-
+        --  50
         <enum-item name='BeStrong'/>
         <enum-item name='BeEnergetic'/>
         <enum-item name='BeForceful'/>
@@ -542,7 +542,7 @@
         <enum-item name='BeGrand'/>
         <enum-item name='BeMerry'/>
         <enum-item name='BeGraceful'/>
-
+        --  60
         <enum-item name='BuildAsItProceeds'/>
         <enum-item name='EvokeTears'/>
         <enum-item name='BeMelancholic'/>
@@ -553,7 +553,7 @@
         <enum-item name='BeJumpy'/>
         <enum-item name='FeelPlayful'/>
         <enum-item name='FeelTender'/>
-
+        --  70
         <enum-item name='FeelCalm'/>
         <enum-item name='BeTriumphant'/>
     </enum-type>
@@ -587,15 +587,130 @@
         <flag-bit name='FreelyAdjustBeats'/>
     </bitfield-type>
 
+    <enum-type type-name='musical_form_passage_component_type' base-type='int32_t'>
+        <enum-item name='Melody'/>
+        <enum-item name='Counterpoint'/>
+        <enum-item name='Harmony'/>
+        <enum-item name='Rhythm'/>
+        <enum-item name='Unspecified'/>
+    </enum-type>
+
+    <enum-type type-name='musical_form_passage_type' base-type='int32_t'>
+        <enum-item name='Unrelated'/>
+        <enum-item name='Introduction'/>
+        <enum-item name='Exposition'/>
+        <enum-item name='Recapitulation'/>
+        <enum-item name='Synthesis'/>
+        <enum-item name='Verse'/>
+        <enum-item name='Chorus'/>
+        <enum-item name='Finale'/>
+        <enum-item name='Coda'/>
+        <enum-item name='BridgePassage'/>
+        <enum-item name='Theme'/>
+        <enum-item name='Variation'/>
+    </enum-type>
+
+    <enum-type type-name='musical_form_passage_length_type' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='Short'/>
+        <enum-item name='MidLength'/>
+        <enum-item name='Long'/>
+        <enum-item name='Varied'/>
+    </enum-type>
+
+    <enum-type type-name='musical_form_melody_style' base-type='int32_t'>
+        <enum-item name='Rising'/>
+        <enum-item name='Falling'/>
+        <enum-item name='RisingFalling'/>
+        <enum-item name='FallingRising'/>
+    </enum-type>
+
+    <enum-type type-name='musical_form_melody_frequency' base-type='int32_t'>
+        <enum-item name='Always'/>
+        <enum-item name='Often'/>
+        <enum-item name='Sometimes'/>
+    </enum-type>
+
+    <struct-type type-name='musical_form_interval'>
+        <int32_t name='degree'/>
+        <bitfield name='flags' base-type='uint32_t'>
+            <flag-bit name='rising' comment='otherwise falling'/>
+            <flag-bit name='flattened'/>
+            <flag-bit name='sharpened'/>
+        </bitfield>
+    </struct-type>
+
+    <struct-type type-name='musical_form_melodies'>
+        <enum name='style' type-name='musical_form_melody_style' base-type='int32_t'/>
+        <enum name='frequency' type-name='musical_form_melody_frequency' base-type='int32_t'/>
+        <stl-vector name='intervals' pointer-type='musical_form_interval'/>
+        <bitfield name='features' type-name='musical_form_feature'/>
+    </struct-type>
+
+    <struct-type type-name='musical_form_passage'>
+        <enum name='type' type-name='musical_form_passage_type' base-type='int32_t'/>
+        <int32_t name='passage_reference' init-value='-1' comment="used when doing Exposition, Recapitualation, Synthesis, and Variation"/>
+        <int32_t name='passage_range_end' init-value='-1' comment="when doing Synthesis of a range of passages"/>
+        <int32_t name='unk_4' comment="'min_times' for a 3-5 range, but doesn't match up with 1 for both repeat 2 times and no repeat mentioned"/>
+        <int32_t name='unk_5' comment="'max_times' for a 3-5 range, but doesn't match up with 1 for both repeat 2 times and no repeat mentioned"/>
+        <int32_t name='poetic_form_id' ref-target='poetic_form'/>
+        <int32_t name='written_content_id' ref-target='written_content' comment="suspect bug in exported legends (and possibly DF itself) as no mentioning of the poems (or any alternative) referenced here were mentioned in the two entries examined"/>
+        <int32_t name='scale_id' ref-target='scale'/>
+        <int32_t name='scale_sub_id' comment="references the scales element of the scale"/>
+        <int32_t name='rhythm_id' ref-target='rhythm'/>
+        <int32_t name='sub_rhythm' comment="Guess, based on the pattern above"/>
+        <int32_t name='rhythm_pattern' comment="references the patterns element of rhythm"/>
+        <stl-vector name='instruments' type-name='int32_t' comment="indices into the instruments vector"/>
+        <stl-vector name='components'>
+            <enum type-name='musical_form_passage_component_type' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='passage_lengths'>
+            <enum type-name='musical_form_passage_length_type' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='lowest_register_range' type-name='int32_t' init-value='-1' comment="0-3 seen. Probably indices into the registers of the instruments referenced. Found no field for timbre description, though"/>
+        <stl-vector name='highest_register_range' type-name='int32_t' init-value='-1' comment="0-3 seen. Probably indices into the registers of the instruments referenced. Found no field for timbre description, though"/>
+        <enum name='tempo_style' type-name='musical_form_style' base-type='int32_t'/>
+        <enum name='dynamic_style' type-name='musical_form_style' base-type='int32_t'/>
+        <enum name='overall_style' type-name='musical_form_style' base-type='int32_t'/>
+        <bitfield name='features' type-name='musical_form_feature'/>
+        <enum name='pitch_style' type-name='musical_form_pitch_style' base-type='int32_t'/>
+        <stl-vector name='melodies' pointer-type='musical_form_melodies'/>
+        <int32_t name='unk_22' init-value='-1' comment="0-40 seen"/>
+        <int32_t name='unk_23' init-value='-1' comment="0-78 seen"/>
+    </struct-type>
+
+    <struct-type type-name='musical_form_instruments'>
+        <int32_t name='instrument_subtype' ref-target='itemdef_instrumentst' comment='-1 = vocal'/>
+        <bitfield base-type='uint32_t' name='substitutions'>
+            <flag-bit name='singer'/>
+            <flag-bit name='speaker'/>
+            <flag-bit name='chanter'/>
+        </bitfield>
+        <bitfield type-name='musical_form_feature' name='features'/>
+        <int32_t name='minimum_required' comment='tentative'/>
+        <int32_t name='maximum_permitted' comment='tentative'/>
+        <enum name='dynamic_style' base-type='int32_t' type-name='musical_form_style'/>
+        <enum name='overall_style' base-type='int32_t' type-name='musical_form_style'/>
+    </struct-type>
+
+    <struct-type type-name='musical_form_sub4'>
+        <int32_t name='passage' comment="the passage index this structure refers to"/>
+        <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'/>
+    </struct-type>
+
     <struct-type type-name='musical_form' instance-vector='$global.world.musical_forms.all' key-field='id'>
         <int32_t name='id'/>
         <compound name='name' type-name='language_name'/>
         <int32_t name="originating_entity" ref-target="historical_entity" comment="ID of the entity from which the musical form originated."/>
         <int32_t name="original_author" ref-target="historical_figure" comment="historical figure ID of the composer"/>
-        <stl-vector name='scales' pointer-type='musical_form_vocals'/>
+        <stl-vector name='passages' pointer-type='musical_form_passage'/>
         <stl-vector name='instruments' pointer-type='musical_form_instruments'/>
         <stl-vector name='melodies' pointer-type='musical_form_melodies'/>
-        <stl-vector pointer-type='musical_form_sub4'/>
+        <stl-vector name='unk_1' pointer-type='musical_form_sub4'/>
         <enum name='tempo_style' base-type='int32_t' type-name='musical_form_style'/>
         <enum name='dynamic_style' base-type='int32_t' type-name='musical_form_style'/>
         <enum name='overall_style' base-type='int32_t' type-name='musical_form_style'/>
@@ -604,9 +719,9 @@
         <int32_t name='scale_id' ref-target='scale'/>
         <int32_t name='scale_subid' comment='reference to scale_sub2'/>
         <int32_t name='rhythm_id' ref-target='rhythm'/>
-        <int32_t name='rhythm_subid2' comment='reference to rhythm_sub2'/>
-        <int32_t name='rhythm_subid1' comment='reference to rhythm_sub1'/>
-        <bitfield type-name='musical_form_feature' name='features'/>
+        <int32_t name='sub_rhythm' comment='reference to sub_rhythms'/>
+        <int32_t name='rhythm_pattern' comment='reference to patterns'/>
+        <bitfield name='features' type-name='musical_form_feature'/>
         <enum name='pitch_style' base-type='int32_t' type-name='musical_form_pitch_style'/>
         <enum name='purpose' base-type='int32_t' type-name='musical_form_purpose'/>
         <int32_t name='devotion_target' ref-target='historical_figure'/>
@@ -616,71 +731,226 @@
         </bitfield>
     </struct-type>
 
-    <struct-type type-name='musical_form_vocals'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector type-name='int32_t'/>
-        <stl-vector name='vocal_components' type-name='int32_t'/> 0: melody, 1: counterpoint, 2: harmony, 3: rhythm
-        <stl-vector name='phrase_lengths' type-name='int32_t'/> 0: short, 1: mid-length, 2: long, 3: varied length
-        <stl-vector type-name='int32_t'/>
-        <stl-vector type-name='int32_t'/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector pointer-type='musical_form_melodies'/>
-        <int32_t/>
-        <int32_t/>
-    </struct-type>
+    <enum-type type-name='dance_form_context' base-type='int32_t'>
+        <enum-item name='Sacred'/>
+        <enum-item name='Celebration'/>
+        <enum-item name='Participation'/>
+        <enum-item name='Social'/>
+        <enum-item name='Performance'/>
+        <enum-item name='War'/>
+    </enum-type>
 
-    <struct-type type-name='musical_form_instruments'>
-        <int32_t name='instrument_subtype' ref-target='itemdef_instrumentst' comment='-1 = vocal'/>
-        <bitfield base-type='uint32_t' name='substitutions'>
-            <flag-bit name='singer'/>
-            <flag-bit name='speaker'/>
-            <flag-bit name='chanter'/>
-        </bitfield>
-        <bitfield type-name='musical_form_feature' name='features'/>
-        <int32_t name='minimum_required' comment='tentative'/>
-        <int32_t name='maximum_permitted' comment='tentative'/>
-        <enum name='dynamic_style' base-type='int32_t' type-name='musical_form_style'/>
-        <enum name='overall_style' base-type='int32_t' type-name='musical_form_style'/>
-    </struct-type>
+    <enum-type type-name='dance_form_group_size' base-type='int32_t'>
+        <enum-item name='Solo'/>
+        <enum-item name='Partner'/>
+        <enum-item name='Group'/>
+    </enum-type>
 
-    <struct-type type-name='musical_form_melodies'>
-        <int32_t name='style'/> 0: rising, 1: falling, 2: rising-falling, 3: falling-rising
-        <int32_t name='frequency'/> 0: always, 1: often, 2: sometimes
-        <stl-vector name='intervals' pointer-type='musical_form_interval'/>
-        <bitfield type-name='musical_form_feature' name='features'/>
-    </struct-type>
+    <enum-type type-name='dance_form_configuration' base-type='int32_t'>
+        <enum-item name='NONE' value='-1' comment="hard to have a configuration with a solo performer"/>
+        <enum-item name='SingleLine'/>
+        <enum-item name='SeveralLines'/>
+        <enum-item name='Circle'/>
+        <enum-item name='DoubleCircle'/>
+        <enum-item name='LooselyMingled'/>
+    </enum-type>
 
-    <struct-type type-name='musical_form_sub4'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+    <enum-type type-name='dance_form_movement_path' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='TurnClockwise'/>
+        <enum-item name='TurnCounterClockwise'/>
+        <enum-item name='ImprovisedPath'/>
+        <enum-item name='IntricatePath'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_partner_distance' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='Closely'/>
+        <enum-item name='OpenContact'/>
+        <enum-item name='RareContact'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_partner_intent' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='PushingTogether'/>
+        <enum-item name='PullingAway'/>
+        <enum-item name='Touch'/>
+        <enum-item name='LightTouch'/>
+        <enum-item name='VisualCues'/>
+        <enum-item name='SpokenCues'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_partner_cue_frequency' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='Constantly'/>
+        <enum-item name='Briefly'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_partner_change_type' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='LeadAdvanceAlongMainLineOfMotion'/>
+        <enum-item name='LeadAdvanceAgainstMainLineOfMotion'/>
+        <enum-item name='LeadTurningOutClockwise'/>
+        <enum-item name='LeadTurningOutCounterClockwise'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_move_type' base-type='int32_t'>
+        <enum-item name='SquareStep'/>
+        <enum-item name='CircularStep'/>
+        <enum-item name='TriangleStep'/>
+        <enum-item name='FigureEightStep'/>
+        <enum-item name='IntricateStep'/>
+        <enum-item name='Dance'/>
+        <enum-item name='Turn'/>
+        <enum-item name='FacialExpression'/>
+        <enum-item name='HandGesture'/>
+        <enum-item name='StraightWalk'/>
+        --  10
+        <enum-item name='CurvedWalk'/>
+        <enum-item name='Run'/>
+        <enum-item name='Leap'/>
+        <enum-item name='Kick'/>
+        <enum-item name='LeftKick'/>
+        <enum-item name='RightKick'/>
+        <enum-item name='LegLift'/>
+        <enum-item name='LeftLegLift'/>
+        <enum-item name='RightLegLift'/>
+        <enum-item name='BodyLevel'/>
+        --  20
+        <enum-item name='BodyLevelChange'/>
+        <enum-item name='ArmCarriage'/>
+        <enum-item name='RaisedLeftArm'/>
+        <enum-item name='RaisedRightArm'/>
+        <enum-item name='RaisedArms'/>
+        <enum-item name='Spin'/>
+        <enum-item name='IndependentBodyMovement'/>
+        <enum-item name='Sway'/>
+        <enum-item name='ForwardBend'/>
+        <enum-item name='BackwardBend'/>
+        --  30
+        <enum-item name='LeftwardBend'/>
+        <enum-item name='RightwardBend'/>
+        <enum-item name='Footwork'/>
+        <enum-item name='MovementAlongLineOfDance'/>
+    </enum-type>
+
+    <enum-type type-name='dance_form_move_modifier' base-type='int32_t'>
+        <enum-item name='NONE' value='-1'/>
+        --  0
+        <enum-item name='Graceful'/>
+        <enum-item name='Serene'/>
+        <enum-item name='SharpEdged'/>
+        <enum-item name='Grotesque'/>
+        <enum-item name='Crude'/>
+        <enum-item name='Refined'/>
+        <enum-item name='Understated'/>
+        <enum-item name='Delicate'/>
+        <enum-item name='Elaborate'/>
+        <enum-item name='Expressive'/>
+        --  10
+        <enum-item name='Strong'/>
+        <enum-item name='Large'/>
+        <enum-item name='Weightless'/>
+        <enum-item name='Fluid'/>
+        <enum-item name='Undulating'/>
+        <enum-item name='Soft'/>
+        <enum-item name='Jerking'/>
+        <enum-item name='Calm'/>
+        <enum-item name='StraightLined'/>
+        <enum-item name='High'/>
+        --  20
+        <enum-item name='Low'/>
+        <enum-item name='LoudlyPercussive'/>
+        <enum-item name='SoftlyPercussive'/>
+        <enum-item name='Aborted'/>
+        <enum-item name='PartiallyRealized'/>
+        <enum-item name='Energetic'/>
+        <enum-item name='Passionate'/>
+        <enum-item name='Vivacious'/>
+        <enum-item name='Joyous'/>
+        <enum-item name='Proud'/>
+        --  30
+        <enum-item name='Flamboyant'/>
+        <enum-item name='Lively'/>
+        <enum-item name='Spirited'/>
+        <enum-item name='Vigorous'/>
+        <enum-item name='Intense'/>
+        <enum-item name='Aggressive'/>
+        <enum-item name='Powerful'/>
+        <enum-item name='Sluggish'/>
+        <enum-item name='Relaxed'/>
+        <enum-item name='Passive'/>
+        --  40
+        <enum-item name='Subtle'/>
+        <enum-item name='Sensual'/>
+        <enum-item name='Debauched'/>
+        <enum-item name='Twisting'/>
+        <enum-item name='Sprightly'/>
+        <enum-item name='Sinuous'/>
+    </enum-type>
+
+    <bitfield-type type-name="dance_form_move_location" base-type="uint32_t">
+        <flag-bit comment="Standard value, but not described"/>
+        <flag-bit comment="Common value, but not described"/>
+        <flag-bit name='MirroredByGroupMembers'/>
+        <flag-bit name='InRetrogradeByGroupMembers'/>
+        <flag-bit name='InSuccessionByGroupMembers'/>
+        <flag-bit name='ShadowedByGroupMembers'/>
+        <flag-bit name='Lead'/>
+        <flag-bit name='Follower'/>
+    </bitfield-type>
+
+    <struct-type type-name='dance_form_section'>
+        <int32_t name='unk_1' init-value='0'/>
+        <int32_t name='unk_2' init-value='1'/>
+        <int32_t name='unk_3' init-value='1'/>
+        <int32_t name='unk_4' init-value='-1'/>
+        <enum name='movement_path' type-name='dance_form_movement_path' base-type='int32_t'/>
+        <int32_t name='move_id' comment="index in the moves vector"/>
+        <enum name='partner_distance' type-name='dance_form_partner_distance' base-type='int32_t'/>
+        <enum name='partner_intent' type-name='dance_form_partner_intent' base-type='int32_t'/>
+        <enum name='partner_cue_frequency' type-name='dance_form_partner_cue_frequency' base-type='int32_t'/>
+        <stl-vector name='partner_changes'>
+            <enum type-name='dance_form_partner_change_type' base-type='int32_t'/>
+        </stl-vector>
+        <int32_t name='unk_11' init-value='0'/>
+        <int32_t name='unk_12' init-value='-1'/>
+        <int32_t name='unk_13' init-value='-1'/>
+        <int32_t name='unk_14' init-value='-1'/>
+        <stl-vector name='type'>
+            <enum type-name='dance_form_move_type' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='modifier'>
+            <enum type-name='dance_form_move_modifier' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='parameter' type-name='int32_t' init-value='1' comment="Depends on type (turns are in signed angles, steps are in number of steps, etc.)"/>
+        <stl-vector name='location'>
+            <bitfield type-name='dance_form_move_location'/>
+        </stl-vector>
+        <int32_t name='id'/>
     </struct-type>
 
-    <struct-type type-name='musical_form_interval'>
-        <int32_t name='degree'/>
-        <bitfield base-type='uint32_t' name='flags'>
-            <flag-bit name='rising' comment='otherwise falling'/>
-            <flag-bit name='flattened'/>
-            <flag-bit name='sharpened'/>
-        </bitfield>
+    <enum-type type-name='dance_form_move_group_type' base-type='int32_t'>
+        <enum-item/>
+        <enum-item name='BasicMovement'/>
+        <enum-item name='DancePosition'/>
+        <enum-item/>
+        <enum-item name='DanceMove'/>
+    </enum-type>
+
+    <struct-type type-name='dance_form_move'>
+        <stl-string name='name'/>
+        <stl-vector name='type'>
+            <enum type-name='dance_form_move_type' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='modifier'>
+            <enum type-name='dance_form_move_modifier' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='parameter' type-name='int32_t' init-value='1' comment="Depends on type (turns are in signed angles, steps are in number of steps, etc.)"/>
+        <stl-vector name='location'>
+            <bitfield type-name='dance_form_move_location'/>
+        </stl-vector>
+        <enum name='group_type' type-name='dance_form_move_group_type' base-type='int32_t'/>
     </struct-type>
 
     <struct-type type-name='dance_form' instance-vector='$global.world.dance_forms.all' key-field='id'>
@@ -688,79 +958,74 @@
         <compound name='name' type-name='language_name'/>
         <int32_t name='musical_form_id'/>
         <int32_t name='music_written_content_id'  ref-target='written_content' comment='at most one of this and musical_form_id is non null'/>
-        <int32_t/>
+        <enum name='context' type-name='dance_form_context' base-type='int32_t'/>
         <int32_t name="originating_entity" ref-target="historical_entity" comment="ID of the entity from which the dance form originated."/>
         <int32_t name="original_author" ref-target="historical_figure" comment="ID of the historical figure who developed the dance form."/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector type-name='int32_t'/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <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'/>
-        <stl-vector pointer-type='dance_form_sub1'/>
-        <stl-vector pointer-type='dance_form_sub2'/>
+        <int32_t name='produce_individual_dances' comment="0:improvise, 1:apply by choreographers. May be bitfield if analogous to corresponding music, but no other values seen"/>
+        <enum name='group_size' type-name='dance_form_group_size' base-type='int32_t'/>
+        <int32_t name='unk_4' init-value='-1' comment="1 seen, and it's always paired with the next field"/>
+        <int32_t name='unk_5' init-value='-1' comment="1 seen, and it's always paired with the previous field"/>
+        <enum name='configuration' type-name='dance_form_configuration' base-type='int32_t'/>
+        <enum name='movement_path' type-name='dance_form_movement_path' base-type='int32_t'/>
+        <int32_t name='unk_8' init-value='-1' comment='0 seen'/>
+        <enum name='partner_distance' type-name='dance_form_partner_distance' base-type='int32_t' comment="NONE when not pair dance"/>
+        <enum name='partner_intent' type-name='dance_form_partner_intent' base-type='int32_t' comment="NONE when not pair dance"/>
+        <enum name='partner_cue_frequency' type-name='dance_form_partner_cue_frequency' base-type='int32_t' comment="NONE when not pair dance and when 'normal'"/>
+        <stl-vector name='partner_changes'>
+            <enum type-name='dance_form_partner_change_type' base-type='int32_t'/>
+        </stl-vector>
+        <bool name='poetry_referenced' comment="Weird, but all instances where it was set examined have the dance act out any composition of a named poetic form, without any presence of the form number found"/>
+        <int32_t name='unk_14' init-value='-1'/>
+        <int32_t name='hfid' ref-target='historical_figure' comment="Character whose story the dance acts out"/>
+        <int32_t name='race' ref-target='creature_raw' comment="Creature whose movements are imitated"/>
+        <stl-vector name='move_type'>
+            <enum type-name='dance_form_move_type' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='move_modifier'>
+            <enum type-name='dance_form_move_modifier' base-type='int32_t'/>
+        </stl-vector>
+        <stl-vector name='move_parameter' type-name='int32_t' init-value='1' comment="Depends on type (turns are in signed angles, steps are in number of steps, etc.)"/>
+        <stl-vector name='move_location'>
+            <bitfield type-name='dance_form_move_location'/>
+        </stl-vector>
+        <stl-vector name='sections' pointer-type='dance_form_section'/>
+        <stl-vector name='moves' pointer-type='dance_form_move'/>
     </struct-type>
 
-    <struct-type type-name='dance_form_sub1'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector type-name='int32_t'/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <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/>
-    </struct-type>
+    <enum-type type-name='scale_type' base-type='int32_t'>
+        <enum-item name='Octave' comment="The octave is divided into X steps of even length"/>
+        <enum-item name='Variable' comment="The octave is divided into notes at varying intervals, approximated by quartertones"/>
+        <enum-item name='PerfectFourth' comment="The perfect fourth interval is divided into steps of even length"/>
+    </enum-type>
 
-    <struct-type type-name='dance_form_sub2'>
-        <stl-string/>
-        <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/>
+    <struct-type type-name='chord'>
+        <stl-string name='name'/>
+        <static-array name='notes' type-name='int32_t' count='5' comment="chord_size entries used. Refers to the notes indices"/>
+        <int32_t name='chord_size'/>
+        <int32_t name='unk_3' comment="0 and 1 seen"/>
     </struct-type>
 
-    <enum-type type-name='unk_scale_enum_type' base-type='int32_t'>
-        <enum-item name='Unk_0'/>
-        <enum-item name='Unk_1'/>
-        <enum-item name='Unk_2'/>
-    </enum-type>
+    <struct-type type-name='named_scale' comment="Seems odd with a 'scale' consisting of two chords, but that's what the exported XML calls it.">
+        <int32_t name='unk_1' comment="0-4 seen. 0: nothing, for when degrees are used, 1: joined chords, 2/3: disjoined chords (varying kinds of chords seen for both), 4: as always, disjoined chords"/>
+        <stl-string name='name'/>
+        <static-array name='degrees' type-name='int32_t' count='7' comment="indices into the (not necessarily named) notes of the scale"/>
+        <int32_t name='degrees_used' comment="elements used in array above"/>
+        <int32_t name='first_chord' init-value='-1' comment="this pair seems to be used when degrees_used = 0. Refers to indices in the chords vector"/>
+        <int32_t name='second_chord' init-value='-1'/>
+    </struct-type>
 
     <struct-type type-name='scale' instance-vector='$global.world.scales.all' key-field='id'>
         <int32_t name='id'/>
-        <int32_t name='flags'/>
-        <enum name='unk_enum' type-name='unk_scale_enum_type' base-type='int32_t'/>
-        <static-array name='unk_indices' type-name='int32_t' count='25' comment="unk_elements_used elements are used, but only when unk_enum = 1. Unused elements uninitialized"/>
-        <int32_t name='unk_indices_used' comment="Number of elements use in array above. Only when unk_enum = 1"/>
-        <stl-vector pointer-type='scale_sub1'/>
-        <stl-vector pointer-type='scale_sub2'/>
-        <compound name='unk1'>
-            <int32_t name='unk_1'/>
+        <bitfield name='flags' base-type='uint32_t'>
+            <flag-bit name='tonic_note_fixed_at_performance' comment="'The tonic note is a fixed tone passed from teacher to student' when 0, 'The tonic note is fixed only at the time of performance' when 1"/>
+        </bitfield>
+        <enum name='type' type-name='scale_type' base-type='int32_t'/>
+        <static-array name='quartertones_used' type-name='int32_t' count='25' comment="Quartertone corresponding note matches. Scale_length elements are used when type = Variable. Unused elements uninitialized"/>
+        <int32_t name='scale_length' comment="Number of notes in the scale. When type = Variable this is the number of used indices pointing out their placement."/>
+        <stl-vector name='chords' pointer-type='chord'/>
+        <stl-vector name='scales' pointer-type='named_scale' comment="Note that the top level scale doesn't have a name. These seem to be named scales using the unnamed scale's notes as their foundation"/>
+        <compound name='notes' comment="Curiously, the named notes do not have to match the number of defined notes">
+            <int32_t name='unk_1' comment="Frequently looks like garbage for all values of type. Suspect it's actually a filler"/>
             <static-array name='name' type-name='stl-string' count='25'/>
             <static-array name='abreviation' type-name='stl-string' count='25'/>
             <static-array name='number' type-name='int32_t' count='25'/>
@@ -768,47 +1033,49 @@
         </compound>
     </struct-type>
 
-    <struct-type type-name='scale_sub1'>
-        <stl-string name='unk_1'/>
-        <static-array name='unk_2' type-name='int32_t' count='5' comment="unk_2_length entries used"/>
-        <int32_t name='unk_2_length'/>
-        <int32_t name='unk_3'/>
+    <struct-type type-name='rhythm' instance-vector='$global.world.rhythms.all' key-field='id'>
+        <int32_t name='id'/>
+        <stl-vector name='patterns' pointer-type='rhythm_pattern'/>
+        <stl-vector name='sub_rhythms' pointer-type='sub_rhythm'/>
+        <int32_t name='unk_2'/>
     </struct-type>
 
-    <struct-type type-name='scale_sub2'>
-        <int32_t name='unk_1'/>
-        <stl-string name='name'/>
-        <static-array name='unk_2' type-name='int32_t' count='7' comment="looks like indices of some kind"/>
-        <int32_t name='unk_2_length' comment="elements used in array above"/>
-        <int32_t name='unk_first' init-value='-1' comment="this pair seems to be used when unk_2_length = 0"/>
-        <int32_t name='unk_last' init-value='-1'/>
-    </struct-type>
+    <enum-type type-name='beat_type' base-type='int32_t'>
+        <enum-item name='Silent' comment="-"/>
+        <enum-item name='AccentedBeat' comment="X"/>
+        <enum-item name='Beat' comment="x"/>
+        <enum-item name='PrimaryAccent' comment="!"/>
+        <enum-item/>
+        <enum-item/>
+        <enum-item/>
+        <enum-item/>
+        <enum-item/>
+        <enum-item name='AccentedBeatSyncopated' comment="X'"/>
+        <enum-item name='BeatSyncopated' comment="x'"/>
+    </enum-type>
 
-    <struct-type type-name='rhythm' instance-vector='$global.world.rhythms.all' key-field='id'>
-        <int32_t name='id'/>
-        <stl-vector pointer-type='rhythm_sub1'/>
-        <stl-vector pointer-type='rhythm_sub2'/>
-        <int32_t/>
+    <struct-type type-name='beat' comment="Work around to allow 'is-array' of enums">
+        <enum type-name='beat_type' base-type='int32_t'/>
     </struct-type>
 
-    <struct-type type-name='rhythm_sub1'>
+    <struct-type type-name='rhythm_pattern'>
         <stl-string name='name'/>
-        <stl-vector>
+        <stl-vector name='bars'>
             <pointer>
-                <pointer type-name='int32_t' is-array='true'/>
+                <pointer name='beat' type-name='beat' is-array='true' comment="Length as per length field"/>
                 <int32_t name='length'/>
             </pointer>
         </stl-vector>
-        <pointer type-name='stl-string'/>
-        <pointer type-name='stl-string'/>
-        <int32_t/>
+        <pointer name='beat_name' type-name='stl-string' is-array='true' comment="length as per length field"/>
+        <pointer name='beat_abbreviation' type-name='stl-string' is-array='true' comment="length as per length field"/>
+        <int32_t name='length'/>
     </struct-type>
 
-    <struct-type type-name='rhythm_sub2'>
+    <struct-type type-name='sub_rhythm'>
         <stl-string name='name'/>
-        <stl-vector type-name='int32_t'/>
-        <stl-vector type-name='int32_t'/>
-        <int32_t/>
+        <stl-vector name='patterns' type-name='int32_t' comment="indices into patterns"/>
+        <stl-vector name='unk_2' type-name='int32_t' comment="Same length as patterns, but with unknown purpose"/>
+        <int32_t name='unk_3'/>
     </struct-type>
 
     <enum-type type-name='occupation_type' base-type='int32_t'>
@@ -832,8 +1099,8 @@
         <stl-vector name='unk_1' pointer-type='occupation_sub1'/>
         <int32_t name='unk_2' init-value='0'/>
         <int32_t name='unk_3' init-value='-1'/>
-        <pointer name='unk_4' type-name='world_site' has-bad-pointers='true'/>
-        <pointer name='unk_5' type-name='abstract_building' has-bad-pointers='true'/>
+        <pointer name='unk_4' type-name='world_site' has-bad-pointers='true' comment="When these haven't crashed the data has been nonsensical"/>
+        <pointer name='unk_5' type-name='abstract_building' has-bad-pointers='true' comment="When these haven't crashed the data has been nonsensical. Has seen duplicate of unk_4 pointer value"/>
     </struct-type>
 
     <struct-type type-name='occupation_sub1'>
diff --git a/df.entities.xml b/df.entities.xml
index 1cf295776..09f9fcdca 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -392,12 +392,12 @@
                 at that level (Some exterminated kobolds have it set, while most do not, for instance. Embark culled dwarven civs
                 may or may not have it set).
             <flag-bit name='worshipping'/>
-            <flag-bit name='unk6' comment="Set for a significant number of entities"/>
+            <flag-bit name='unk6'/>
             <flag-bit name='unk7'/>
             <flag-bit name='player_government' comment="Appears when embarking (and having unpaused)"/>
             <flag-bit name='unk9'/>
             <flag-bit name='unspecific_race' comment="Can be set for SiteGovernment, always set for Guild and PerformanceTroupe. Never set for NomadicGroup even when race=-1"/>
-            <flag-bit name='unk11' comment="Set for a significant number of entities. Includes the full [6] set, plus some"/>
+            <flag-bit name='unk11' comment="Set for a significant number of entities. It might indicate that entity is dead, although kobold civs never seem to have this flag set, even when their cave has been conquered or destroyed"/>
             <flag-bit name='unk12' comment="Set for all but unnamed civs, kobold entities, vault governments, and cave civ building race Outcasts. Set when an entity creates a poetic form."/>
             <flag-bit name='unk13' comment="Set for a significant number of entities"/>
             <flag-bit name='unk14' comment="Set for a significant number of entities"/>
@@ -1343,7 +1343,7 @@
     <enum-type type-name='crime_type' base-type='int32_t'>
         <enum-item name='NONE' value='-1'/>
         <enum-item name='Bribery'/>
-        <enum-item/>
+        <enum-item name='BringIntoNetwork'/>
         <enum-item name='Corruption'/>
         <enum-item name='Embezzlement'/>
     </enum-type>
diff --git a/df.history.xml b/df.history.xml
index 591ae481e..a8e72a8e5 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -69,6 +69,7 @@
 
         <enum-item name='PreserverOfKnowledge'/>
         <enum-item name='Intruder'/>
+        <enum-item name='Preacher'/>
     </enum-type>
 
     <!-- This enum is tentative -->
@@ -241,48 +242,48 @@
 
         <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'/>
+            <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" 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>
+            <stl-vector name='unk_1'>
                 <pointer>
-                    <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'/>
+                    <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 name='unk_7' since='v0.47.01'/>
+                    <int32_t name='unk_8' since='v0.47.01'/>
+                    <int32_t name='unk_9' since='v0.47.01'/>
+                    <int32_t name='unk_10' since='v0.47.01'/>
+
+                    <int32_t name='unk_11' since='v0.47.01'/>
+                    <int32_t name='unk_12' since='v0.47.01'/>
+                    <int32_t name='unk_13' since='v0.47.01'/>
+                    <int32_t name='unk_14' since='v0.47.01'/>
+
+                    <int32_t name='unk_15' since='v0.47.01'/>
+                    <int32_t name='unk_16' since='v0.47.01'/>
+                    <int32_t name='unk_17' since='v0.47.01'/>
                 </pointer>
             </stl-vector>
             <stl-vector name='known_events' pointer-type='entity_event'/>
-            <stl-vector type-name='int32_t'/>
-            <stl-vector type-name='int32_t'/>
-            <stl-vector type-name='int32_t' comment="same length as next vector. Might be entities"/>
-            <stl-vector type-name='int32_t' comment="5 only value seen"/>
-            <stl-vector>
+            <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"/>
+            <stl-vector name='unk_7' type-name='int32_t' comment="5, 7, 8 seen. 7/8 only seen on humanoid experiments"/>
+            <stl-vector name='unk_8'>
                 <pointer>
-                    <int32_t/>
-                    <int32_t/>
+                    <int32_t name='unk_1'/>
+                    <int32_t name='unk_2'/>
 
-                    <stl-vector type-name='int32_t'/>
-                    <stl-vector type-name='int32_t'/>
-                    <stl-vector type-name='int32_t'/>
+                    <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'/>
+                    <int32_t name='unk_6' since='v0.42.01'/>
                 </pointer>
             </stl-vector>
             <stl-vector name="known_poetic_forms" type-name='int32_t' ref-target='poetic_form' since='v0.42.01'/>
@@ -304,9 +305,9 @@
                 <bitfield type-name='knowledge_scholar_flags_12' name='engineering'/>
                 <bitfield type-name='knowledge_scholar_flags_13' name='engineering2'/>
                 <uint32_t name='knowledge_goal_category'/>
-                <uint32_t/>
-                <uint32_t/>
-                <uint32_t/>
+                <uint32_t name='unk_1'/>
+                <uint32_t name='unk_2'/>
+                <uint32_t name='unk_3'/>
                 <bitfield name='knowledge_goal'>
                     <flag-bit name='unk0'/>
                 </bitfield>
@@ -314,22 +315,22 @@
                 <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 type-name='int32_t' ref-target='belief_system'/>
+                <stl-vector name='unk_1' type-name='int32_t' ref-target='belief_system'/>
             </pointer>
             <pointer name='unk_a8'>
-                <stl-vector>
+                <stl-vector name='unk_1'>
                     <pointer>
                         <int32_t name='site_id' ref-target='world_site' comment="characters have visited fortresses seen"/>
-                        <int32_t init-value='0'/>
-                        <int32_t init-value='-1'/>
-                        <int32_t init-value='-1'/>
-                        <int32_t init-value='-1'/>
-                        <int32_t init-value='-1'/>
-                        <static-array type-name='int32_t' count='8'/>
+                        <int32_t name='unk_1' init-value='0' comment="The single 1 made a discovery, the single 5 settled, but lots of others have settled, an more discoveries have probably been made"/>
+                        <int32_t name='unk_2' init-value='-1'/>
+                        <int32_t name='unk_3' init-value='-1'/>
+                        <int32_t name='unk_4' init-value='-1'/>
+                        <int32_t name='unk_5' init-value='-1'/>
+                        <static-array name='unk_6' type-name='int32_t' count='8'/>
                     </pointer>
                 </stl-vector>
             </pointer>
-            <stl-vector type-name='int32_t' since='v0.47.01'/>
+            <stl-vector name='unk_3' type-name='int32_t' since='v0.47.01'/>
         </pointer>
 
         <pointer name='curse' since='v0.34.01'>
@@ -354,50 +355,50 @@
             <stl-string name="name_adjective"/>
             <int32_t name='race' ref-target='creature_raw'/>
             <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
-            <stl-vector type-name='int32_t' name="unk_a0"/>
-            <stl-vector type-name='int32_t' name="unk_b0"/>
-            <stl-vector type-name='int32_t' name="unk_c0"/>
+            <stl-vector name='unk_a0' type-name='int32_t'/>
+            <stl-vector name='unk_b0' type-name='int32_t'/>
+            <stl-vector name='unk_c0' type-name='int32_t'/>
             <int32_t name="original_histfig_id" ref-target='historical_figure' comment='ID of the historical figure who was reanimated to produce undead historical figure'/>
             <int32_t name="original_race" ref-target='creature_raw' comment='race of the historical figure who was reanimated to produce undead historical figure'/>
             <int32_t name="original_caste" ref-target='caste_raw' aux-value='$$.original_race' comment='caste of the historical figure who was reanimated to produce undead historical figure'/>
             <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 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'/>
+            <pointer name='unk_1' since='v0.47.01'>
+                <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'/>
+                <stl-vector name='unk_4' type-name='int32_t'/>
+                <stl-vector name='unk_5' type-name='int32_t'/>
                 <int32_t/>
             </pointer>
             <pointer name='experiments' since='v0.47.01'>
-                <stl-vector type-name='int32_t'/>
-                <stl-vector type-name='int32_t' name='races' comment='contains IDs of races created by the historical figure through experimentation'/>
+                <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>
         </pointer>
 
         <pointer name='books' since='v0.34.01' comment="seems to be misnamed. Artifacts seen have been of all kinds">
             <stl-vector name='artifacts_held' pointer-type='artifact_record' comment="held as in possession, doesn't include stored"/>
-            <int32_t since='v0.44.01' comment="values seen: 0, 3, 69, 164, 178, 226, 514"/>
-            <int32_t since='v0.47.01' comment="values seen: 0-5"/>
-            <static-array type-name='int32_t' count='13' since='v0.44.06' comment="wildly varying contents. Probably unitialized, as at least some change when same save reloaded"/>
-            <static-array type-name='int32_t' count='13' since='v0.44.06' comment="ditto"/>
+            <int32_t name='unk_1' since='v0.44.01' comment="values seen: 0, 3, 69, 164, 178, 226, 514"/>
+            <int32_t name='unk_2' since='v0.47.01' comment="values seen: 0-5"/>
+            <static-array name='unk_3' type-name='int32_t' count='13' since='v0.44.06' comment="wildly varying contents. Probably unitialized, as at least some change when same save reloaded"/>
+            <static-array name='unk_4' type-name='int32_t' count='13' since='v0.44.06' comment="ditto"/>
             <bitfield name='flags' base-type='uint32_t' since='v0.44.06'>
                 <flag-bit/>
                 <flag-bit/>
                 <flag-bit/>
                 <flag-bit/>
             </bitfield>
-            <int16_t since='v0.44.06' comment='not saved'/>
-            <pointer since='v0.47.01'>
-                <stl-vector>
+            <int16_t name='unk_5' since='v0.44.06' comment='not saved'/>
+            <pointer name='unk_6' since='v0.47.01'>
+                <stl-vector name='unk_1'>
                     <pointer>
-                        <int32_t/>
-                        <int32_t/>
+                        <int32_t name='unk_1'/>
+                        <int32_t name='unk_2'/>
                     </pointer>
                 </stl-vector>
-                <int32_t/>
+                <int32_t  name='unk_2'/>
             </pointer>
         </pointer>
 
@@ -413,9 +414,9 @@
                         <int32_t name="unsolved_murders"/>
                         there's an unused dword here on 64-bit
                     </compound>
-                    <int32_t since='v0.47.01'/>
-                    <int32_t init-value='-1' since='v0.47.01'/>
-                    <int32_t since='v0.47.01'/>
+                    <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> different from above - this might be wanted.unk
@@ -434,28 +435,28 @@
             <stl-vector name="all_identities" type-name='int32_t' ref-target='identity'/>
             <int32_t name='next_identity_idx'/>
             <pointer name='unk_2c' since='v0.44.01'>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <stl-vector>
+                <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 name='unk_7'/>
+                <int32_t name='unk_8'/>
+                <int32_t name='unk_9'/>
+                <int32_t name='unk_10'/>
+                <int32_t name='unk_11'/>
+                <stl-vector name='unk_12'>
                     <pointer>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
+                        <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>
                 </stl-vector>
-                <stl-vector type-name='int32_t' since='v0.44.01'/>
+                <stl-vector name='unk_13' type-name='int32_t' since='v0.44.01'/>
             </pointer>
         </pointer>
 
@@ -476,19 +477,19 @@
                     <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"/>
-                <int16_t name="rank" since='v0.47.01'/>
-                <int32_t name='loyalty' comment="0 - 100"/>
+                <int16_t name='rank' init-value='-1' 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
                 <int32_t name='fear' comment="-100 - 100"/>
-                <int32_t name='love' comment="-100 - 100"/>
+                <int32_t name='love' comment="-100 - 100. Affects relation description: -100: Pure Hate, LE -75: Hated, LE -50: Disliked, LE 49: Acquaintance, LE 74: Friend, LE 99: Close Friend, 100: Kindred Spirit. Lower histfig_id is sorted above higher, except Acquaintance which is sorted on Familiarity"/>
                 <int32_t name='trust' comment="-100 - 100"/>
-                <int32_t comment="0 - 60 seen"/>
+                <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' since='v0.44.10'/>
-                <int32_t since='v0.44.10'/>
-                <int32_t since='v0.44.10'/>
+                <int32_t name='unk_2' since='v0.44.10'/>
+                <int32_t name='unk_3' since='v0.44.10'/>
                 <stl-vector name='identities' type-name='int32_t' ref-target='identity'/>
                 <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'/>
@@ -575,7 +576,7 @@
                         <enum-item name='Grow_Corruption_Network'/>
                         <enum-item name='Attain_Rank'/>
                         <enum-item name='Assassinate_Actor'/>
-                        <enum-item name='unk5_t6'/>
+                        <enum-item name='Corruptly_Punish_Actor'/>
                         <enum-item name='Frame_Actor'/>
                         <enum-item name='Kidnap_Actor'/>
                         <enum-item name='Sabotage_Actor'/>
@@ -597,12 +598,12 @@
                         <pointer name='Grow_Corruption_Network' comment="seems uninitialized"/>
                         <pointer name='Attain_Rank' comment="pointer not seen"/>
                         <pointer name='Assassinate_Actor' comment="pointer not seen"/>
-                        <pointer name='unk5_t6'/>
+                        <pointer name='Corruptly_Punish_Actor'/>
                         <pointer name='Frame_Actor' comment="seems uninitialized"/>
                         <pointer name='Kidnap_Actor' comment="pointer not seen"/>
                         <pointer name='Sabotage_Actor'>
-                            <int32_t init-value='-1' comment="not seen anything else"/>
-                            <int32_t init-value='-1' comment="not seen anything else"/>
+                            <int32_t name='unk_1' init-value='-1' comment="not seen anything else"/>
+                            <int32_t name='unk_2' init-value='-1' comment="not seen anything else"/>
                         </pointer>
                         <pointer name='Direct_War_To_Actor' comment="pointer not seen"/>
                         <pointer name='Corrupt_Actors_Government' comment="pointer not seen"/>
@@ -717,6 +718,7 @@
         <enum-item name='SonEldest2'/>
         <enum-item name='SonEldest3'/>
         <enum-item name='SonEldest4'/>
+        --  10
         <enum-item name='SonEldest5'/>
         <enum-item name='SonEldest6'/>
         <enum-item name='SonEldest7'/>
@@ -727,6 +729,7 @@
         <enum-item name='SonYoungest'/>
         <enum-item name='SonOnly'/>
         <enum-item name='DaughterEldest'/>
+        --  20
         <enum-item name='DaughterEldest2'/>
         <enum-item name='DaughterEldest3'/>
         <enum-item name='DaughterEldest4'/>
@@ -737,6 +740,7 @@
         <enum-item name='DaughterEldest9'/>
         <enum-item name='DaughterEldest10'/>
         <enum-item name='Daughter'/>
+        --  30
         <enum-item name='DaughterOnly'/>
         <enum-item name='DaughterYoungest'/>
         <enum-item name='ChildEldest'/>
@@ -747,6 +751,7 @@
         <enum-item name='ChildEldest6'/>
         <enum-item name='ChildEldest7'/>
         <enum-item name='ChildEldest8'/>
+        --  40
         <enum-item name='ChildEldest9'/>
         <enum-item name='ChildEldest10'/>
         <enum-item name='Child'/>
@@ -757,6 +762,7 @@
         <enum-item name='MaternalGrandmother'/>
         <enum-item name='MaternalGrandfather'/>
         <enum-item name='Grandmother'/>
+        --  50
         <enum-item name='Grandfather'/>
         <enum-item name='Grandparent'/>
         <enum-item name='OlderBrother'/>
@@ -767,11 +773,20 @@
         <enum-item name='YoungerSibling'/>
         <enum-item name='Cousin'/>
         <enum-item name='Aunt'/>
+        --  60
         <enum-item name='Uncle'/>
         <enum-item name='Niece'/>
         <enum-item name='Nephew'/>
         <enum-item name='Sibling'/>
         <enum-item name='Grandchild'/>
+        <enum-item name='OlderHalfBrother' since='v0.47.01' comment="'since' valid for this entry and those below"/>
+        <enum-item name='OlderHalfSister'/>
+        <enum-item name='OlderHalfSibling'/>
+        <enum-item name='YoungerHalfBrother'/>
+        <enum-item name='YoungerHalfSister'/>
+        --  70
+        <enum-item name='YoungerHalfSibling'/>
+        <enum-item name='HalfSibling'/>
     </enum-type>
 
     <enum-type type-name='vague_relationship_type' base-type='int16_t' comment="not a great name given that lovers, ex lovers, and lieutenants appear here, but histfig and unit are both used...">
@@ -799,7 +814,8 @@
         <enum-item name='apprentice'/>
         <enum-item name='companion'/>
         <enum-item name='ex_spouse'/>
-        <enum-item name='shared_entity'/>
+        <enum-item name='neighbor'/>
+        <enum-item name='shared_entity' comment="Religion/PerformanceTroupe/MerchantCompany/Guild"/>
     </enum-type>
 
     <struct-type type-name='historical_figure' instance-vector='$global.world.history.figures' key-field='id'>
@@ -867,38 +883,42 @@
             <df-array name="unk_8" type-name='int16_t'/>
         </pointer>
         <pointer name="unk_v47_2">
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <int16_t/>
-            <int16_t/>
-            <int16_t/>
-            <int16_t/>
-            <int16_t/>
-            <int16_t/>
-            <int32_t/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
-            <pointer type-name='historical_figure'/>
+            <pointer name='unk_1' type-name='historical_figure'/>
+            <pointer name='unk_2' type-name='historical_figure'/>
+            <pointer name='unk_3' type-name='historical_figure'/>
+            <pointer name='unk_4' type-name='historical_figure'/>
+            <pointer name='unk_5' type-name='historical_figure'/>
+            <pointer name='unk_6' type-name='historical_figure'/>
+            <int16_t name='unk_7'/>
+            <int16_t name='unk_8'/>
+            <int16_t name='unk_9'/>
+            <int16_t name='unk_10'/>
+            <int16_t name='unk_11'/>
+            <int16_t name='unk_12'/>
+            <int32_t name='unk_13'/>
+            <pointer name='unk_14' type-name='historical_figure'/>
+            <pointer name='unk_15' type-name='historical_figure'/>
+            <pointer name='unk_16' type-name='historical_figure'/>
         </pointer>
         <int32_t name="unk_v47_3"/>
         <int32_t name="unk_v47_4"/>
         <int32_t name='unk_v4019_1' init-value='-1' since='v0.40.17-19'/>
-        <int32_t init-value='-1'/>
+        <int32_t name='unk_5' init-value='-1'/>
     </struct-type>
 
     <enum-type type-name='identity_type' base-type='int32_t'>
          <enum-attr name='id_tag' comment='for identity.id'/>
 
+         <enum-item name='None'  value='-1' comment="Seen on adventurer assuming an identity for reasons unknown">
+            <item-attr name='id_tag' value='histfig_id'/>
+         </enum-item>
+
          <enum-item name='HidingCurse' comment="Inferred from Units.cpp after examining code using 'unk_4c'">
             <item-attr name='id_tag' value='histfig_id'/>
          </enum-item>
 
-         <enum-item name='Unk_1' comment="Not seen. A guess is that it might have been used by deities under cover">
-            <item-attr name='id_tag' value='histfig_id' comment="guess as to what the ref-target is"/>
+         <enum-item name='Impersonating' comment="Seen where primeval creatures impersonate 'real' gods in modded game">
+            <item-attr name='id_tag' value='histfig_id'/>
          </enum-item>
 
          <enum-item name='TrueName' comment="E.g. of demonic overlords. Can be used by adventurers to gain sway over them">
@@ -909,8 +929,8 @@
             <item-attr name='id_tag' value='nemesis_id'/>
          </enum-item>
 
-         <enum-item name='Unk_4'>
-            <item-attr name='id_tag' value='histfig_id' comment="guess as to what the ref-target is"/>
+         <enum-item name='InfiltrationIdentity' comment="A guess. The cases seen all had the HFs fool the same entity that they were members of it, but no actual purpose was seen">
+            <item-attr name='id_tag' value='histfig_id'/>
          </enum-item>
 
          <enum-item name='Identity' comment="Claim a new official identity, seen when religious appointments are received">
@@ -923,7 +943,7 @@
         dtor 0x8C17FA0
 
         <int32_t name='id'/>
-        <compound name='name' type-name='language_name'/>
+        <compound name='name' type-name='language_name' comment="Not used when Impersonating"/>
 
         <code-helper name='describe'>
             (describe-obj $.name)
@@ -934,7 +954,7 @@
         <int32_t name='race' ref-target='creature_raw'/>
         <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
 
-        <int32_t name='unk_1'/>
+        <int32_t name='impersonated_hf' ref-target='historical_figure' comment="only when Impersonating"/>
         <compound is-union='true' union-tag-attr='id_tag'>
             <int32_t name='histfig_id' ref-target='historical_figure'/>
             <int32_t name='nemesis_id' ref-target='nemesis_record'/>
@@ -948,19 +968,19 @@
         <int32_t name='unk_3'/>
         <int16_t name='unk_v47_1' init-value='-1'/>
         <int32_t name='unk_v47_2' init-value='-1'/>
-        <enum base-type='int16_t' name='profession' type-name='profession'/>
+        <enum name='profession' type-name='profession' base-type='int16_t'/>
         <int32_t name='entity_id' ref-target='historical_entity'/>
         <stl-vector name='unk_4' pointer-type='identity_unk_94'/>
         <stl-vector name='unk_5' pointer-type='identity_unk_94'/>
     </struct-type>
 
     <struct-type type-name='identity_unk_94'>
-        <stl-vector type-name='int32_t'/>
-        <stl-vector type-name='int32_t'/>
-        <int32_t init-value='-1'/>
-        <int32_t init-value='-1'/>
-        <int32_t/>
-        <int32_t comment='uninitialized'/>
+        <stl-vector name='unk_1' type-name='int32_t'/>
+        <stl-vector name='unk_2' type-name='int32_t'/>
+        <int32_t name='unk_3' init-value='-1'/>
+        <int32_t name='unk_4' init-value='-1'/>
+        <int32_t name='unk_5'/>
+        <int32_t name='unk_6' comment='uninitialized'/>
     </struct-type>
 
     <enum-type type-name='mental_picture_property_type'>
@@ -989,53 +1009,53 @@
     </class-type>
 
     <class-type type-name='mental_picture_property_datest' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_actionst' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
+        <int32_t name='unk_3'/>
+        <int32_t name='unk_4'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_toolst' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
+        <int32_t name='unk_3'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_emotionst' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_color_patternst' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_shapest' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_adjectivest' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_positionst' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
+        <int32_t name='unk_3'/>
     </class-type>
 
     <class-type type-name='mental_picture_property_timest' inherits-from='mental_picture_propertyst'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1'/>
+        <int32_t name='unk_2'/>
+        <int32_t name='unk_3'/>
     </class-type>
 
 
@@ -1059,15 +1079,15 @@
     </class-type>
 
     <class-type type-name='mental_picture_element_hfst' inherits-from='mental_picture_elementst'>
-        <int32_t/>
+        <int32_t name='unk_1'/>
     </class-type>
 
     <class-type type-name='mental_picture_element_sitest' inherits-from='mental_picture_elementst'>
-        <int32_t/>
+        <int32_t name='unk_1'/>
     </class-type>
 
     <class-type type-name='mental_picture_element_regionst' inherits-from='mental_picture_elementst'>
-        <int32_t/>
+        <int32_t name='unk_1'/>
     </class-type>
 
 
@@ -1250,6 +1270,8 @@
             <item-attr name='caption' value='that more might die'/>
         </enum-item>
 
+        -- 10
+
         <enum-item name='liked_appearance'>
             <item-attr name='caption' value='that all should gaze upon a truly gruesome visage'/>
         </enum-item>
@@ -1281,6 +1303,8 @@
             <item-attr name='caption' value='to provide opportunities for acts of valor to be performed'/>
         </enum-item>
 
+        -- 20
+
         <enum-item name='bring_war_to_the_world'>
             <item-attr name='caption' value='that war might rage forever'/>
         </enum-item>
@@ -1312,6 +1336,8 @@
             <item-attr name='caption' value='to cry on somebody in charge'/>
         </enum-item>
 
+        -- 30
+
         <enum-item name='should_have_reached_goal'>
             <item-attr name='caption' value='as the goal was not reached'/>
         </enum-item>
@@ -1343,6 +1369,8 @@
             <item-attr name='caption' value='after invocation of the true name'/>
         </enum-item>
 
+        -- 40
+
         <enum-item name='arrived_at_person'>
             <item-attr name='caption' value='after finding an unknown creature'/>
         </enum-item>
@@ -1374,6 +1402,8 @@
             <item-attr name='caption' value='in order to continue working alone'/>
         </enum-item>
 
+        -- 50
+
         <enum-item name='jealousy'>
             <item-attr name='caption' value='due to jealousy'/>
         </enum-item>
@@ -1405,6 +1435,8 @@
             <item-attr name='caption' value='in order to admire achitecture'/>
         </enum-item>
 
+        -- 60
+
         <enum-item name='pray'>
             <item-attr name='caption' value='in order to pray'/>
         </enum-item>
@@ -1436,6 +1468,8 @@
             <item-attr name='caption' value='in order to sanctify an unknown creature'/>
         </enum-item>
 
+        -- 70
+
         <enum-item name='artifact_is_heirloom_of_family_hfid'>
             <item-attr name='caption' value='as an heirloom of the an unknown creature family'/>
         </enum-item>
@@ -1467,6 +1501,8 @@
             <item-attr name='caption' value='to smooth the operation of an unknown civilization'/>
         </enum-item>
 
+        -- 80
+
         <enum-item name='nuance_belief'>
             <item-attr name='caption' value='due to a belief in nuances of'/>
         </enum-item>
@@ -1498,6 +1534,8 @@
             <item-attr name='caption' value='due to lack of funds'/>
         </enum-item>
 
+        -- 90
+
         <enum-item name='battle_losses'>
             <item-attr name='caption' value='after taking heavy losses in battle'/>
         </enum-item>
@@ -1619,6 +1657,11 @@
         <enum-item comment='related to intrigues (checked in df::history_event_failed_intrigue_corruptionst::getRelatedHistfigIDs)'/>
     </enum-type>
 
+    <bitfield-type type-name='merc_role_type' base-type='uint8_t' since='v0.47.02' comment="regular if bit not set">
+        <flag-bit name='attacker_scout'/>
+        <flag-bit name='defender_scout'/>
+    </bitfield-type>
+
     <class-type type-name='history_event' original-name='history_eventst'
                 instance-vector='$global.world.history.events' key-field='id'>
         <int32_t name='year'/>
@@ -1761,11 +1804,7 @@
         <int32_t name='defender_general_hf' ref-target='historical_figure'/>
         <int32_t name='attacker_merc_enid' ref-target='historical_entity' since='v0.47.02'/>
         <int32_t name='defender_merc_enid' ref-target='historical_entity' since='v0.47.02'/>
-        <enum name='unk_1' base-type='int8_t' since='v0.47.02'>
-            <enum-item/>
-            <enum-item/>
-            <enum-item/>
-        </enum>
+        <bitfield name='merc_roles' type-name='merc_role_type' since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_war_destroyed_sitest' inherits-from='history_event'>
@@ -1856,13 +1895,13 @@
         <int32_t name='subregion' ref-target='world_region'/>
         <int32_t name='feature_layer' ref-target='world_underground_region'/>
 
-        <enum base-type='int16_t' name='death_cause' type-name='death_type'/>
+        <enum name='death_cause' type-name='death_type' base-type='int16_t'/>
     </class-type>
 
     <class-type type-name='history_event_add_hf_entity_linkst' inherits-from='history_event'>
         <int32_t name='civ' ref-target='historical_entity'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
-        <enum base-type='int32_t' name='link_type' type-name='histfig_entity_link_type'/>
+        <enum name='link_type' type-name='histfig_entity_link_type' base-type='int32_t'/>
         <int32_t name='position_id' comment='index into entity.positions.own'/>
         <int32_t name='appointer_hfid' ref-target='historical_figure' since='v0.47.02'/>
         <int32_t name='promise_to_hfid' ref-target='historical_figure' since='v0.47.02'/>
@@ -1871,7 +1910,7 @@
     <class-type type-name='history_event_remove_hf_entity_linkst' inherits-from='history_event'>
         <int32_t name='civ' ref-target='historical_entity'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
-        <enum base-type='int32_t' name='link_type' type-name='histfig_entity_link_type'/>
+        <enum name='link_type' type-name='histfig_entity_link_type' base-type='int32_t'/>
         <int32_t name='position_id' comment='index into entity.positions.own'/>
     </class-type>
 
@@ -1897,33 +1936,33 @@
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
-        <enum base-type='int16_t' type-name='meeting_topic' name='topic'/>
+        <enum name='topic' type-name='meeting_topic' base-type='int16_t'/>
         <int32_t name='result' comment='range from -3 to +2'/>
     </class-type>
 
     <class-type type-name='history_event_topicagreement_rejectedst' inherits-from='history_event'>
-        <enum base-type='int16_t' type-name='meeting_topic' name='topic'/>
+        <enum name='topic' type-name='meeting_topic' base-type='int16_t'/>
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
     <class-type type-name='history_event_topicagreement_madest' inherits-from='history_event'>
-        <enum base-type='int16_t' type-name='meeting_topic' name='topic'/>
+        <enum name='topic' type-name='meeting_topic' base-type='int16_t'/>
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
     <class-type type-name='history_event_war_peace_acceptedst' inherits-from='history_event'>
-        <enum base-type='int16_t' type-name='meeting_topic' name='topic'/>
+        <enum name='topic' type-name='meeting_topic' base-type='int16_t'/>
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
     <class-type type-name='history_event_war_peace_rejectedst' inherits-from='history_event'>
-        <enum base-type='int16_t' type-name='meeting_topic' name='topic'/>
+        <enum name='topic' type-name='meeting_topic' base-type='int16_t'/>
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
@@ -1991,7 +2030,7 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='site_property_id'/>
         <int32_t name='subregion_id' ref-target='world_region'/>
-        <int32_t init-value='-1' since='v0.47.01' comment="probably feature_layer_id, based on other events, but haven't seen non -1"/>
+        <int32_t name='unk_1' since='v0.47.01' init-value='-1' comment="probably feature_layer_id, based on other events, but haven't seen non -1"/>
     </class-type>
 
     <class-type type-name='history_event_artifact_foundst' inherits-from='history_event'>
@@ -2000,8 +2039,8 @@
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='site_property_id' since='v0.47.02' init-value='-1'/>
-        <int32_t since='v0.47.02' init-value='-1' comment="probably subregion_id, based on other events, but haven't seen non -1"/>
-        <int32_t since='v0.47.02' init-value='-1' comment="probably feature_layer_id, based on other events, but haven't seen non -1"/>
+        <int32_t name='unk_1' init-value='-1' since='v0.47.02' comment="probably subregion_id, based on other events, but haven't seen non -1"/>
+        <int32_t name='unk_2' init-value='-1' since='v0.47.02' comment="probably feature_layer_id, based on other events, but haven't seen non -1"/>
     </class-type>
 
     <class-type type-name='history_event_artifact_recoveredst' inherits-from='history_event'>
@@ -2072,7 +2111,7 @@
         <int32_t name='entity' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
-        <enum base-type='int32_t' name='action' type-name='entity_action_type'/>
+        <enum name='action' type-name='entity_action_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_entity_incorporatedst' inherits-from='history_event'>
@@ -2080,7 +2119,7 @@
         <int32_t name='join_entity' ref-target='historical_entity'/>
         <int32_t name='leader_hfid' ref-target='historical_figure' since='v0.47.02'/>
         <int32_t name='site' ref-target='world_site'/>
-        <int32_t since='v0.47.02'/>
+        <bool name='partial' since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_created_buildingst' inherits-from='history_event'>
@@ -2105,7 +2144,7 @@
         <int32_t name='structure' ref-target='abstract_building'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <enum base-type='int32_t' name='type' type-name='histfig_site_link_type'/>
+        <enum name='type' type-name='histfig_site_link_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_remove_hf_site_linkst' inherits-from='history_event'>
@@ -2113,19 +2152,19 @@
         <int32_t name='structure' ref-target='abstract_building'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <enum base-type='int32_t' name='type' type-name='histfig_site_link_type'/>
+        <enum name='type' type-name='histfig_site_link_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_add_hf_hf_linkst' inherits-from='history_event'>
         <int32_t name='hf' ref-target='historical_figure'/>
         <int32_t name='hf_target' ref-target='historical_figure'/>
-        <enum base-type='int32_t' name='type' type-name='histfig_hf_link_type'/>
+        <enum name='type' type-name='histfig_hf_link_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_remove_hf_hf_linkst' inherits-from='history_event'>
         <int32_t name='hf' ref-target='historical_figure'/>
         <int32_t name='hf_target' ref-target='historical_figure'/>
-        <enum base-type='int32_t' name='type' type-name='histfig_hf_link_type'/>
+        <enum name='type' type-name='histfig_hf_link_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_entity_razed_buildingst' inherits-from='history_event'>
@@ -2142,24 +2181,24 @@
     </class-type>
 
     <class-type type-name='history_event_masterpiece_created_arch_designst' inherits-from='history_event_masterpiece_createdst'>
-        <int32_t/>
+        <int32_t name='unk_1'/>
         <int16_t name='building_type'/>
         <int16_t name='building_subtype'/>
         <int32_t name='building_custom'/>
-        <int32_t/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='history_event_masterpiece_created_arch_constructst' inherits-from='history_event_masterpiece_createdst'>
-        <int32_t/>
+        <int32_t name='unk_1'/>
         <int16_t name='building_type'/>
         <int16_t name='building_subtype'/>
         <int32_t name='building_custom'/>
-        <int32_t/>
+        <int32_t name='unk_2'/>
     </class-type>
 
     <class-type type-name='history_event_masterpiece_created_itemst'
                 inherits-from='history_event_masterpiece_createdst'>
-        <enum base-type='int16_t' name='item_type' type-name='item_type'/>
+        <enum name='item_type' type-name='item_type' base-type='int16_t'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int16_t name='mat_index'/>
@@ -2167,24 +2206,24 @@
     </class-type>
 
     <class-type type-name='history_event_masterpiece_created_dye_itemst' inherits-from='history_event_masterpiece_createdst'>
-        <int32_t/>
-        <enum base-type='int16_t' name='item_type' type-name='item_type'/>
+        <int32_t name='unk_1'/>
+        <enum name='item_type' type-name='item_type' base-type='int16_t'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <int32_t/>
+        <int32_t name='unk_2'/>
         <int16_t name='dye_mat_type' ref-target='material' aux-value='$$.dye_mat_index'/>
         <int32_t name='dye_mat_index'/>
     </class-type>
 
     <class-type type-name='history_event_masterpiece_created_item_improvementst' inherits-from='history_event_masterpiece_createdst'>
-        <int32_t/>
-        <enum base-type='int16_t' name='item_type' type-name='item_type'/>
+        <int32_t name='unk_1'/>
+        <enum name='item_type' type-name='item_type' base-type='int16_t'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <int32_t/>
-        <enum base-type='int16_t' name='improvement_type' type-name='improvement_type'/>
+        <int32_t name='unk_2'/>
+        <enum name='improvement_type' type-name='improvement_type' base-type='int16_t'/>
         <int32_t name='improvement_subtype'/>
         <int16_t name='imp_mat_type' ref-target='material' aux-value='$$.imp_mat_index'/>
         <int32_t name='imp_mat_index'/>
@@ -2200,7 +2239,7 @@
 
     <class-type type-name='history_event_masterpiece_created_engravingst'
                 inherits-from='history_event_masterpiece_createdst'>
-        <enum base-type='int32_t' name="skill_rating" type-name='skill_rating'
+        <enum name="skill_rating" type-name='skill_rating' base-type='int32_t'
               comment='at the moment of creation'/>
         <int32_t name='art_id' ref-target='art_image_chunk'/>
         <int16_t name='art_subid' ref-target='art_image' aux-value='$$.art_id'/>
@@ -2219,7 +2258,7 @@
         <int32_t name='creation_event' ref-target='history_event'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
-        <enum base-type='int16_t' name="method" type-name='masterpiece_loss_type'/>
+        <enum name="method" type-name='masterpiece_loss_type' base-type='int16_t'/>
     </class-type>
 
     <class-type type-name='history_event_change_hf_statest' inherits-from='history_event'>
@@ -2232,7 +2271,7 @@
             <enum-item/>
             <enum-item name='Visiting'/>
         </enum>
-        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum name='reason' type-name='history_event_reason' base-type='int32_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2241,8 +2280,8 @@
 
     <class-type type-name='history_event_change_hf_jobst' inherits-from='history_event'>
         <int32_t name='hfid' ref-target='historical_figure'/>
-        <enum base-type='int16_t' name='new_job' type-name='profession'/>
-        <enum base-type='int16_t' name='old_job' type-name='profession'/>
+        <enum name='new_job' type-name='profession' base-type='int16_t'/>
+        <enum name='old_job' type-name='profession' base-type='int16_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2258,7 +2297,7 @@
         <int32_t name='defender_general_hf' ref-target='historical_figure'/>
         <int32_t name='attacker_merc_enid' ref-target='historical_entity' since='v0.47.02'/>
         <int32_t name='defender_merc_enid' ref-target='historical_entity' since='v0.47.02'/>
-        <bool name='a_support_merc_enid_toggle' since='v0.47.02' comment="Toggles attacker_merc_enid field into a_support_merc_enid. Not seen defender_merc_enid set together with this flag" />
+        <bitfield name='merc_roles' type-name='merc_role_type' since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_war_plundered_sitest' inherits-from='history_event'>
@@ -2266,7 +2305,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'/>
-        <int32_t init-value='-1' since='v0.47.01' comment="2=detected, probably"/>
+        <int32_t name='unk_1' init-value='-1' since='v0.47.01' comment="2=detected"/>
     </class-type>
 
     <class-type type-name='history_event_war_site_new_leaderst' inherits-from='history_event'>
@@ -2305,7 +2344,7 @@
     </class-type>
 
     <class-type type-name='history_event_body_abusedst' inherits-from='history_event'>
-        <stl-vector name='bodies' type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name='bodies' ref-target='historical_figure' type-name='int32_t'/>
         <int32_t name='victim_entity' ref-target='historical_entity'/>
         <int32_t name='civ' ref-target='historical_entity'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
@@ -2313,7 +2352,7 @@
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
         <compound name='region_pos' type-name='coord2d'/>
-        <enum base-type='int16_t' name='abuse_type'>
+        <enum name='abuse_type' base-type='int16_t'>
             <enum-item name='Impaled'/>
             <enum-item name='Piled'/>
             <enum-item name='Flayed'/>
@@ -2323,7 +2362,7 @@
         </enum>
         <compound name='abuse_data' is-union='true'>
             <compound name='Impaled'>
-                <enum base-type='int16_t' name='item_type' type-name='item_type' comment='always WEAPON?'/>
+                <enum name='item_type' type-name='item_type' base-type='int16_t' comment='always WEAPON?'/>
                 <int32_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
                 <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
                 <int32_t name='mat_index'/>
@@ -2345,9 +2384,9 @@
             </compound>
             <compound name='Animated'>
                 <int32_t name='interaction' ref-target='interaction'/>
-                <int32_t init-value='0'/>
-                <int32_t init-value='-1'/>
-                <int32_t init-value='-1'/>
+                <int32_t name='unk_1' init-value='0'/>
+                <int32_t name='unk_2' init-value='-1'/>
+                <int32_t name='unk_3' init-value='-1'/>
             </compound>
         </compound>
     </class-type>
@@ -2361,8 +2400,15 @@
         <int32_t name='layer' ref-target='world_underground_region'/>
     </class-type>
 
+    <enum-type type-name='theft_method_type' base-type='int32_t'>
+        <enum-item name='Theft'/>
+        <enum-item name='Confiscated'/>
+        <enum-item name='Looted'/>
+        <enum-item name='Recovered'/>
+    </enum-type>
+
     <class-type type-name='history_event_item_stolenst' inherits-from='history_event'>
-        <enum base-type='int16_t' name='item_type' type-name='item_type'/>
+        <enum name='item_type' type-name='item_type' base-type='int16_t'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
 
         <int16_t name='mattype' ref-target='material' aux-value='$$.matindex'/>
@@ -2378,10 +2424,10 @@
 
         <compound name='region_pos' type-name='coord2d'/>
 
-        <int32_t/>
+        <int32_t name='stash_site' ref-target='world_site' comment="location to which the thief brought the loot"/>
         <compound name='circumstance' type-name='history_event_circumstance_info'/>
         <compound name='reason' type-name='history_event_reason_info'/>
-        <int32_t/>
+        <enum name='theft_method' type-name='theft_method_type' base-type='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_hf_razed_buildingst' inherits-from='history_event'>
@@ -2511,12 +2557,20 @@
         <int32_t name='target' ref-target='historical_entity'/>
     </class-type>
 
+    <enum-type type-name='position_creation_reason_type' base-type='int16_t'>
+        <enum-item name='force_of_argument'/>
+        <enum-item name='threat_of_violence'/>
+        <enum-item name='collaboration'/>
+        <enum-item name='wave_of_popular_support'/>
+        <enum-item name='as_a_matter_of_course'/>
+    </enum-type>
+
     <class-type type-name='history_event_create_entity_positionst' inherits-from='history_event'>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='civ' ref-target='historical_entity'/>
         <int32_t name='site_civ' ref-target='historical_entity'/>
         <int32_t name='position'/> historical_entity.position
-        <int16_t name='reason'/>
+        <enum name='reason' type-name='position_creation_reason_type' base-type='int16_t'/>
     </class-type>
 
     <class-type type-name='history_event_change_creature_typest' inherits-from='history_event'>
@@ -2539,7 +2593,7 @@
         </bitfield>
         <int32_t name='actor_hfid' ref-target='historical_figure' since='v0.47.02'/>
         <int32_t name='interaction' ref-target='interaction' since='v0.47.02'/>
-        <int32_t since='v0.47.02'/>
+        <int32_t name='unk_1' init-value='0' since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_hf_learns_secretst' inherits-from='history_event'>
@@ -2562,7 +2616,7 @@
 
     <class-type type-name='history_event_change_hf_body_statest' inherits-from='history_event'>
         <int32_t name='histfig' ref-target='historical_figure'/>
-        <enum base-type='int8_t' name='body_state' type-name='histfig_body_state'/>
+        <enum name='body_state' type-name='histfig_body_state' base-type='int8_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
         <int32_t name='region' ref-target='world_region'/>
@@ -2594,7 +2648,7 @@
     <class-type type-name='history_event_hf_confrontedst' inherits-from='history_event'>
         <int32_t name='target' ref-target='historical_figure'/>
         <int32_t name='accuser' ref-target='historical_figure'/>
-        <stl-vector name='reasons' type-name='int32_t'/> murder, not aging
+        <stl-vector name='reasons' type-name='int32_t' comment="0 = ageless, 1 = murder"/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2615,10 +2669,10 @@
     <class-type type-name='history_event_hf_gains_secret_goalst' inherits-from='history_event'>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <enum name='goal' type-name='goal_type' base-type='int32_t'/>
-        <int32_t since='v0.47.02' init-value='-1'/>
-        <int32_t since='v0.47.02' init-value='-1'/>
-        <enum base-type='int32_t' name='reason' type-name='history_event_reason' since='v0.47.02'/>
-        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t name='unk_1' since='v0.47.02' init-value='-1'/>
+        <int32_t name='unk_2' since='v0.47.02' init-value='-1'/>
+        <enum name='reason' type-name='history_event_reason' base-type='int32_t' since='v0.47.02'/>
+        <int32_t name='unk_3' since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_storedst' inherits-from='history_event'>
@@ -2630,7 +2684,7 @@
     </class-type>
 
     <class-type type-name='history_event_agreement_formedst' inherits-from='history_event'>
-        <int32_t name='agreement_id'/>
+        <int32_t name='agreement_id' ref-target='agreement'/>
         <bool name='delegated' since='v0.47.02'/>
     </class-type>
 
@@ -2652,9 +2706,9 @@
     </class-type>
 
     <class-type type-name='history_event_agreement_concludedst' inherits-from='history_event'>
-        <int32_t name='agreement_id'/>
+        <int32_t name='agreement_id' ref-target='agreement'/>
         <int32_t name='subject_id'/>
-        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum name='reason' type-name='history_event_reason' base-type='int32_t'/>
         <int32_t name='concluder_hf' ref-target='historical_figure'/>
     </class-type>
 
@@ -2698,8 +2752,8 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <stl-vector type-name='int32_t' name='competitor_hf' ref-target='historical_figure'/>
-        <stl-vector type-name='int32_t' name='winner_hf' ref-target='historical_figure'/>
+        <stl-vector name='competitor_hf' ref-target='historical_figure' type-name='int32_t'/>
+        <stl-vector name='winner_hf' ref-target='historical_figure' type-name='int32_t'/>
     </class-type>
 
     <class-type type-name='history_event_processionst' inherits-from='history_event'>
@@ -2728,7 +2782,7 @@
 
     <class-type type-name='history_event_artifact_transformedst' inherits-from='history_event'>
         <int32_t name='new_artifact' ref-target='artifact_record'/>
-        <stl-vector type-name='int32_t' name='old_artifact' ref-target='artifact_record'/>
+        <stl-vector name='old_artifact' ref-target='artifact_record' type-name='int32_t'/>
         <int32_t name='unit' ref-target='unit'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
@@ -2744,8 +2798,8 @@
     <class-type type-name='history_event_hf_relationship_deniedst' inherits-from='history_event'>
         <int32_t name='seeker_hf' ref-target='historical_figure'/>
         <int32_t name='target_hf' ref-target='historical_figure'/>
-        <enum base-type='int32_t' name='type' type-name='unit_relationship_type'/>
-        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum name='type' type-name='unit_relationship_type' base-type='int32_t'/>
+        <enum name='reason' type-name='history_event_reason' base-type='int32_t'/>
         <int32_t name='reason_id' ref-target='historical_figure' comment='the historical figure that the reason describes'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
@@ -2803,8 +2857,8 @@
 
     <class-type type-name='history_event_change_hf_moodst' inherits-from='history_event'>
         <int32_t name='histfig' ref-target='historical_figure'/>
-        <enum base-type='int16_t' name='mood' type-name='mood_type'/>
-        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum name='mood' type-name='mood_type' base-type='int16_t'/>
+        <enum name='reason' type-name='history_event_reason' base-type='int32_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2816,7 +2870,7 @@
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='entity' ref-target='historical_entity'/>
         <int32_t name='position_profile'/>
-        <enum base-type='int32_t' name='claim_type' type-name='artifact_claim_type'/>
+        <enum name='claim_type' type-name='artifact_claim_type' base-type='int32_t'/>
         <compound name='circumstance' type-name='history_event_circumstance_info'/>
         <compound name='reason' type-name='history_event_reason_info'/>
     </class-type>
@@ -2846,7 +2900,7 @@
     <class-type type-name='history_event_hf_recruited_unit_type_for_entityst' inherits-from='history_event'>
         <int32_t name='entity' ref-target='historical_entity'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
-        <enum base-type='int16_t' name='profession' type-name='profession'/>
+        <enum name='profession' type-name='profession' base-type='int16_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2857,8 +2911,8 @@
         <int32_t name='identity1' ref-target='identity'/>
         <int32_t name='histfig2' ref-target='historical_figure'/>
         <int32_t name='identity2' ref-target='identity'/>
-        <enum base-type='int32_t' name='rep1' type-name='reputation_type'/>
-        <enum base-type='int32_t' name='rep2' type-name='reputation_type'/>
+        <enum name='rep1' type-name='reputation_type' base-type='int32_t'/>
+        <enum name='rep2' type-name='reputation_type' base-type='int32_t'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -2906,9 +2960,19 @@
         <stl-vector name='rescued_hfs' type-name='int32_t' ref-target='historical_figure'/>
     </class-type>
 
+    <enum-type type-name='simple_action_type' base-type='int32_t'>
+        <enum-item name='carouse'/>
+        <enum-item name='purchase_well_crafted_equipment'/>
+        <enum-item name='purchase_finely_crafted_equipment'/>
+        <enum-item name='purchase_superior_equipment'/>
+        <enum-item name='purchase_exceptional_equipment'/>
+        <enum-item name='purchase_masterwork_equipment'/>
+        <enum-item name='performe_horrible_experiments'/>
+    </enum-type>
+
     <class-type type-name='history_event_hist_figure_simple_actionst' inherits-from='history_event'>
         <stl-vector name='group_hfs' type-name='int32_t' ref-target='historical_figure'/>
-        <int32_t name='type' comment='0 = hf carouse'/>
+        <enum name='type' type-name='simple_action_type'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
         <int32_t name='region' ref-target='world_region'/>
@@ -2942,7 +3006,7 @@
         <int32_t name='a_tactics_roll'/>
         <int32_t name='d_tactics_roll'/>
 
-        <enum base-type='int32_t' name='situation' type-name='tactical_situation'/>
+        <enum name='situation' base-type='int32_t' type-name='tactical_situation'/>
 
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
@@ -3028,7 +3092,7 @@
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='structure' comment='index into world_site.buildings'/>
       <int32_t name='hf' ref-target='historical_figure'/>
-      <int32_t/> always 12?
+      <int32_t name='unk_1'/> always 12?
       <bitfield name='modification' base-type='uint32_t'>
         <flag-bit name='dungeon'/>
         <flag-bit name='fortifications'/>
@@ -3042,9 +3106,9 @@
       <int32_t name='building_profile'/>
       <int32_t name='acquirer_hf' ref-target='historical_figure'/>
       <int32_t name='acquirer_entity' ref-target='historical_entity'/>
-      <int32_t name='acquisition_type' comment='0: purchased, 1: inherited, 2: rebuilt'/>
+      <int32_t name='acquisition_type' comment="0: purchased, 1: inherited, 2: rebuilt. Doesn't match. Seen purchased_unowned, inherited, and rebuilt_ruined together when value = 0"/>
       <int32_t name='previous_owner_hf' ref-target='historical_figure'/>
-      <int32_t />
+      <int32_t name='unk_1' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_hf_preachst' inherits-from='history_event' since='v0.47.01'>
@@ -3118,8 +3182,8 @@
       <int32_t name='corruptor_identity'/>
       <int32_t name='target_hf' ref-target='historical_figure'/>
       <int32_t name='target_identity'/>
-      <int32_t/> ? 6 = plots and schemes, 11 = agent
-      <int32_t/> ? 4 = plots and schemes, 21 = agent
+      <int32_t name='target_role' ref-target='plot_role_type'/>
+      <int32_t name='corruptor_role' ref-target='plot_role_type'/>
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='region' ref-target='world_region' since='v0.47.02'/>
       <int32_t name='layer' ref-target='world_underground_region' since='v0.47.02'/>
@@ -3250,23 +3314,25 @@
         <compound type-name='language_name' name='name'/>
         <stl-vector name='attacker_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='defender_civ' type-name='int32_t' ref-target='historical_entity'/>
-        <stl-vector type-name='int32_t' ref-target='historical_entity' comment="when length 2 attacker/defender entity. When longer seems to contain unrelated civs at varying locations"/>
+        <stl-vector name='unk_1' type-name='int32_t' ref-target='historical_entity' comment="when length 2 attacker/defender entity. When longer seems to contain unrelated civs at varying locations"/>
         <compound name='unk'>
-            <stl-vector type-name='int16_t' init-value='0' comment="These 5 vectors are the same length,0 or 1. Only 0 seen"/>
+            <stl-vector name='unk_1' type-name='int16_t' init-value='0' comment="These 5 vectors are the same length,0 or 1. Only 0 seen"/>
             <stl-vector name='attacker_entity_leader' type-name='int32_t' ref-target='historical_figure'/>
-            <stl-vector type-name='int32_t' init-value='-1' comment="only -1 seen"/>
-            <stl-vector type-name='int32_t' init-value='-1' comment="only -1 seen"/>
-            <stl-vector type-name='int32_t' comment="only -5 and -6 seen"/>
-            <int32_t comment="same as previous vector single element or zero. Sum?"/>
+            <stl-vector name='unk_2' type-name='int32_t' init-value='-1' comment="25, 25, 46 seen. All on the first few (oldest) collections."/>
+            <stl-vector name='unk_3' type-name='int32_t' init-value='-1' comment="only -1 seen"/>
+            <stl-vector name='unk_4' type-name='int32_t' comment="-5,-6, -14 -15 seen"/>
+            <int32_t name='unk_5' comment="same as previous vector single element or zero. Sum?"/>
+
             <stl-vector name='ethics_unk1' type-name='int16_t' comment="these three vectors are of the same length"/>
             <stl-vector name='disputed_ethics' type-name='ethic_type'/>
             <stl-vector name='ethics_unk3' type-name='int32_t' init-value='-1' comment="not seen other value"/>
             <stl-vector name='dispute_severities' type-name='int32_t'/>
             <int32_t name='accumulated_ethics_severity'/>
-            <stl-vector type-name='int16_t' comment='these three vectors are the same length'/>
-            <stl-vector type-name='int32_t'/>
-            <stl-vector type-name='int32_t'/>
-            <int32_t name='accumulated_unk_severity' comment="sum of previous vector values"/>
+
+            <stl-vector name='event_unk' type-name='int16_t' comment="values 5 and 10 seen. These three vectors are the same length"/>
+            <stl-vector name='negative_events' ref-target='history_event' type-name='int32_t' comment="Site dispute, war attack site, created site, and culled seen"/>
+            <stl-vector name='event_severities' type-name='int32_t' comment="Site dispute:-9/-10, war attack site:-2/-4/-5, created site: -20, culled: -20 (guess failed settlement)"/>
+            <int32_t name='accumulated_event_severity' comment="sum of previous vector values"/>
         </compound>
     </class-type>
 
@@ -3285,28 +3351,25 @@
         <stl-vector name='defender_hf' type-name='int32_t' ref-target='historical_figure'/>
         <stl-vector name='defender_role' type-name='int32_t' comment="same as for attacker role, i.e. 0-2, with 1/2 being mercs"/>
         <stl-vector name='noncombat_hf' type-name='int32_t' ref-target='historical_figure' comment="saw being beheaded, but that's only one checked"/>
-
-        <enum name='attacker_merc_type' base-type='int8_t'>
-            <enum-item name='mercenaries'/>
-            <enum-item name='mercenary_scouts'/>
-            <enum-item name='unk_2'/>
-        </enum>
+        <bitfield name='merc_roles' type-name='merc_role_type'/>
         <int32_t name='attacker_mercs' ref-target='historical_entity'/>
         <int32_t name='defender_mercs' ref-target='historical_entity'/>
-        <stl-vector type-name='int32_t' comment="Observed size of 4 doesn't allow for pointer"/>
-        <stl-vector type-name='int32_t' comment="Observed size of 4 doesn't allow for pointer"/>
+        <stl-vector name='attacker_merc_hfs' ref-target='historical_figure' type-name='int32_t'/>
+        <stl-vector name='defender_merc_hfs' ref-target='historical_figure' type-name='int32_t'/>
+
         <stl-vector name='attacker_squad_entity_pop' type-name='int32_t' ref-target='entity_population'/>
         <stl-vector name='attacker_squad_counts' type-name='int32_t'/>
         <stl-vector name='attacker_squad_deaths' type-name='int32_t'/>
         <stl-vector name='attacker_squad_races' type-name='int32_t' ref-target='creature_raw'/>
         <stl-vector name='attacker_squad_sites' type-name='int32_t' ref-target='world_site'/>
-        <stl-vector type-name='int32_t' comment="probably a boolean, as only 0/1 seen"/>
+        <stl-vector name='unk_3' type-name='int32_t' comment="probably a boolean, as only 0/1 seen"/>
+
         <stl-vector name='defender_squad_entity_pops' type-name='int32_t' ref-target='entity_population'/>
         <stl-vector name='defender_squad_counts' type-name='int32_t'/>
         <stl-vector name='defender_squad_deaths' type-name='int32_t'/>
         <stl-vector name='defender_squad_races' type-name='int32_t' ref-target='creature_raw'/>
         <stl-vector name='defender_squad_sites' type-name='int32_t' ref-target='world_site'/>
-        <stl-vector type-name='int32_t' comment="probably a boolean, as only 0/1 seen"/>
+        <stl-vector name='unk_4' type-name='int32_t' comment="probably a boolean, as only 0/1 seen"/>
         <int16_t name='outcome' comment='0 = attacker won, 1 = defender won'/>
     </class-type>
 
@@ -3320,7 +3383,7 @@
         <int32_t name='attacker_hf' ref-target='historical_figure'/>
         <int32_t name='defender_hf' ref-target='historical_figure'/>
         <int32_t name='ordinal'/>
-        <int8_t comment="probably boolean. Only 0/1 seen. Looks like winner, with all '1' examined showing defeat of defender, from unscathed to death, and '0' showing no result at all or death of attacker"/>
+        <int8_t name='unk_1' comment="probably boolean. Only 0/1 seen. Looks like winner, with all '1' examined showing defeat of defender, from unscathed to death, and '0' showing no result at all or death of attacker"/>
     </class-type>
 
     <class-type type-name='history_event_collection_site_conqueredst' inherits-from='history_event_collection'>
@@ -3329,7 +3392,7 @@
 
         <stl-vector name='attacker_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='defender_civ' type-name='int32_t' ref-target='historical_entity'/>
-        <int16_t comment='uninitialized'/>
+        <int16_t name='unk_1' comment='uninitialized'/>
         <int32_t name='ordinal'/>
     </class-type>
 
@@ -3345,7 +3408,7 @@
 
         <stl-vector name='snatcher_hf' type-name='int32_t' ref-target='historical_figure'/>
         <stl-vector name='victim_hf' type-name='int32_t' ref-target='historical_figure'/>
-        <stl-vector type-name='int32_t'/>
+        <stl-vector name='unk_1' type-name='int32_t'/>
         <int32_t name='ordinal'/>
     </class-type>
 
@@ -3366,14 +3429,14 @@
         <stl-vector name='stolen_mat_indices' type-name='int32_t'/>
         <stl-vector name='stolen_item_ids' type-name='int32_t' ref-target='item'/>
 
-        <stl-vector type-name='int32_t'/> most likely the same format as above
-        <stl-vector type-name='int16_t'/>
-        <stl-vector type-name='int16_t'/>
-        <stl-vector type-name='int16_t'/>
-        <stl-vector type-name='int32_t'/>
-        <stl-vector type-name='int32_t'/>
+        <stl-vector name='unk_1' type-name='int32_t'/> most likely the same format as above
+        <stl-vector name='unk_2' type-name='int16_t'/>
+        <stl-vector name='unk_3' type-name='int16_t'/>
+        <stl-vector name='unk_4' type-name='int16_t'/>
+        <stl-vector name='unk_5' type-name='int32_t'/>
+        <stl-vector name='unk_6' type-name='int32_t'/>
 
-        <stl-vector type-name='int32_t'/>
+        <stl-vector name='unk_7' type-name='int32_t'/>
         <int32_t name='ordinal'/>
     </class-type>
 
@@ -3409,32 +3472,32 @@
     <class-type type-name='history_event_collection_performancest' inherits-from='history_event_collection'>
         <int32_t name='parent_collection' ref-target='history_event_collection' comment="all seen were occasions"/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <int32_t comment="0-11 seen"/>
-        <int32_t comment="0-9 seen"/>
+        <int32_t name='unk_1' comment="0-11 seen"/>
+        <int32_t name='unk_2' comment="0-9 seen"/>
         <int32_t name='ordinal'/>
     </class-type>
 
     <class-type type-name='history_event_collection_competitionst' inherits-from='history_event_collection'>
         <int32_t name='parent_collection' ref-target='history_event_collection' comment="all seen were occasions"/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <int32_t comment="0-13 seen"/>
-        <int32_t comment="0-8 seen"/>
+        <int32_t name='unk_1' comment="0-13 seen"/>
+        <int32_t name='unk_2' comment="0-9 seen"/>
         <int32_t name='ordinal'/>
     </class-type>
 
     <class-type type-name='history_event_collection_processionst' inherits-from='history_event_collection'>
         <int32_t name='parent_collection' ref-target='history_event_collection' comment="all seen were occasions"/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <int32_t comment="0-14 seen"/>
-        <int32_t comment="0-9 seen"/>
+        <int32_t name='unk_1' comment="0-14 seen"/>
+        <int32_t name='unk_2' comment="0-9 seen"/>
         <int32_t name='ordinal'/>
     </class-type>
 
     <class-type type-name='history_event_collection_ceremonyst' inherits-from='history_event_collection'>
         <int32_t name='parent_collection' ref-target='history_event_collection' comment="all seen were occasions"/>
         <int32_t name='civ' ref-target='historical_entity'/>
-        <int32_t comment="0-14 seen"/>
-        <int32_t comment="0-9 seen"/>
+        <int32_t name='unk_1' comment="0-14 seen"/>
+        <int32_t name='unk_2' comment="0-10 seen"/>
         <int32_t name='ordinal'/>
     </class-type>
 
@@ -3551,7 +3614,7 @@
         <int32_t name='total_powers' comment='also includes megabeasts'/>
         <int32_t name='total_megabeasts'/>
         <int32_t name='total_semimegabeasts'/>
-        <stl-vector/>
+        <stl-vector name='unk_14'/>
         <static-array name='unk_v42_1' type-name='int16_t' count='28' since='v0.42.01'/> unsure but 16-bit values make more sense than 32-bit
         <stl-vector name='intrigues' since='v0.47.01' pointer-type='intrigue'/>
         <stl-vector name='live_megabeasts' pointer-type='historical_figure'/>
@@ -3574,22 +3637,22 @@
         <stl-vector name='unk_histfig_11' since='v0.40.01' pointer-type='historical_figure'/>
         <stl-vector name='unk_histfig_12' since='v0.44.01' pointer-type='historical_figure'/>
         <stl-vector name='unk_histfig_13' since='v0.44.01' pointer-type='historical_figure'/>
-        <stl-vector since='v0.44.01' pointer-type='historical_figure'/>
-        <stl-vector since='v0.47.01'/>
-        <stl-vector since='v0.47.01' pointer-type='historical_figure'/>
-        <stl-vector since='v0.47.01'/>
-        <stl-vector since='v0.47.01'/>
-        <int8_t/>
+        <stl-vector name='unk_3' since='v0.44.01' pointer-type='historical_figure'/>
+        <stl-vector name='unk_4' since='v0.47.01'/>
+        <stl-vector name='unk_5' since='v0.47.01' pointer-type='historical_figure'/>
+        <stl-vector name='unk_6' since='v0.47.01'/>
+        <stl-vector name='unk_7' since='v0.47.01'/>
+        <int8_t name='unk_8'/>
         <stl-vector name='active_event_collections' pointer-type='history_event_collection'/>
-        <int8_t/>
-        <int32_t/>
-        <int32_t/>
+        <int8_t name='unk_10'/>
+        <int32_t name='unk_11'/>
+        <int32_t name='unk_12'/>
         <pointer name='active_mission' type-name='mission_report'/>
     </struct-type>
 
     <struct-type type-name='intrigue' instance-vector='$global.world.history.intrigues' key-field='event_id'>
-        <int32_t name='event_id' ref-target='history_event'/>
-        <pointer name='corruption' type-name='intrigue_corruption'/>
+        <int32_t name='event_id' ref-target='history_event' comment="NOTE: can be culled. Seen: failed_intrigue_corruption, event_agreement_formed, hfs_formed_intrigue_relationship"/>
+        <pointer name='corruption' type-name='intrigue_corruption' comment="Mutually exclusive with circumstance. Exactly one is present. Presumably 'bring into network' action doesn't provide membership"/>
         <compound name='reason' type-name='history_event_reason_info'/>
         <compound name='circumstance' type-name='history_event_circumstance_info'/>
     </struct-type>
@@ -3598,9 +3661,9 @@
         <enum name='crime' type-name='crime_type'/>
         <int32_t name='corruptor_id' ref-target='historical_figure'/>
         <int32_t name='target_id' ref-target='historical_figure'/>
-        <enum name='target_relationship' type-name='vague_relationship_type'/>
-        <int32_t name='target_relationship_entity_id' ref-target='historical_entity'/>
-        <int32_t name='lurer_id' ref-target='historical_figure'/>
+        <enum name='target_relationship' type-name='vague_relationship_type' comment="set if and only if action = BringIntoNetwork"/>
+        <int32_t name='target_relationship_entity_id' ref-target='historical_entity' comment="Only set when relation = CommonEntity. Common Religion/PerformanceTroupe/MerchantCompany/Guild seen."/>
+        <int32_t name='lurer_id' ref-target='historical_figure' comment="Can be set with action = CorruptInPlace, not otherwise"/>
 
         <enum name='manipulation_type'>
             <enum-item name='Threat'/>
@@ -3612,15 +3675,15 @@
             <enum-item name='Revenge'/>
             <enum-item name='Immortality'/>
         </enum>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_4' comment="-16 to 315 seen"/>
+        <int32_t name='unk_5' comment="-141 to 351 seen"/>
 
         <enum name='manipulated_facet' type-name='personality_facet_type'/>
-        <int32_t/>
+        <int32_t name='facet_rating'/>
         <int32_t name='facet_roll'/>
 
         <enum name='manipulated_value' type-name='value_type'/>
-        <int32_t/>
+        <int32_t name='value_rating'/>
         <int32_t name='value_roll'/>
 
         <enum name='manipulated_emotion'>
@@ -3630,15 +3693,15 @@
             <enum-item name='Fear'/>
             <enum-item name='Respect'/>
         </enum>
-        <int32_t/>
-        <int32_t name='emotion_roll'/>
+        <int32_t name='emotion_rating' comment="-100 to 125 seen"/>
+        <int32_t name='emotion_roll' comment="-10 to 12 seen"/>
 
         <bitfield name='flags'>
             <flag-bit name='succeeded'/>
             <flag-bit name='misread_target'/>
         </bitfield>
 
-        <int32_t name='position_entity_id' ref-target='historical_entity'/>
+        <int32_t name='position_entity_id' ref-target='historical_entity' comment="Used to pull rank"/>
         <int32_t name='position_assignment_id' ref-target='entity_position_assignment' aux-value='$$.position_entity_id'/>
 
         <int32_t name='offered_id' ref-target='historical_figure' comment='deity or revenge target'/>
diff --git a/df.items.xml b/df.items.xml
index 870fcdd8d..13fc5b5b4 100644
--- a/df.items.xml
+++ b/df.items.xml
@@ -1017,7 +1017,7 @@
     </class-type>
     <class-type type-name='item_plant_growthst' inherits-from='item_actual'>
         <int16_t name='subtype'/>
-        <int32_t/>
+        <int32_t name='growth_print'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
         <int32_t name='rot_timer'/>
diff --git a/df.military.xml b/df.military.xml
index c5596fa7a..c1212816c 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -346,44 +346,44 @@
     </class-type>
 
     Some army_controller research notes:
-      A number of attacks on the player fortress have been studied. In all cases an army_controller with a type = t2 and a site_id = player fortress were generated
-      at the start of a new season (for some reason old ones can remain lingering. They can be distinguished from the new one by their old time stamp). The master_hf was
-      the boss/master/leader of the goblin civ (not site) or necro site (they don't have civs), and that character was not seen in the later invasion. The general_hf was
-      the general leading the attack. At that stage, i.e. before the attack actually happened, unk_64.t2.army_id referenced an army found in the armies.all vector, but
-      that army wasn't present any longer when the attack was underway. The army nemesis vector contained characters, probably squad leaders, present in the attack.
-      The army controller field pointed to an army_controller with type = t4 that wasn't present in the army_controllers.all vector, with the original army_controller's
-      general_hf (t2) taking the role of master_hf, with a subordinate (present in the army nemesis vector) taking the general_hf role.
-      Legends Mode reports of the attacks showed the original army_controller's (t2) general_hf as the leader of the attack.
-        pos_x/pos_y has some kind of relation unk_64.t2.unk_x_a, unk_x_b/unk_y_a, unk_y_b and the army.pos/last_pos x/y fields. Seem to be members of a pair of sets with
-      the numbers gradually increasing.
-
-      SentToTributary (t12) appears in the army_controller vector only very briefly. It might possibly be related to legitimate visitors.
-
-      Quester army controller (t17) doesn't seem to contain any useful info except the site_id, time, and the artifact_id, in particular not anything that looks like
-      references to the questers themselves or their employer.
-
-      t24: Looks like villainous visitors. Legitimate ones don't seem to use army controllers.
+      t1: All seen NomadicGroup. master = group boss, general = leader of army (with troops) referencing controller. Purpose and action unknown.
+
+      An InvasionOrder (2) is generated at the start of the season, shortly followed by an army that references an Invasion controller. The army disappears from the armies.all
+      vector once it enters the embark.
+
+      Invasion (4) has been seen via InvasionOrder army_controllers' armies, but only player fortress attacks have been studied. Prior to the army appears in the armies.all vector this controller
+      seems to be available via the army_controllers.all vector referencing the the InvasionOrder via unk_34.
+
+      t5: unk_34 seen referencing Invasion (4) and unk_38 referencing t5 (player fortress) or t7, disappearing when an army is generated (at least for player fortress).
+
+      Visit (12) appears in the army_controller vector only very briefly before legitimate visitors arrive, and is also used for exiled residents.
+
+      Quest (17) doesn't seem to contain any useful info except the site_id, time, and the artifact_id, in particular not anything that looks like
+      references to the questers themselves or their employer. However, prior to arriving at the site, armies in armies.all can reference the controller, and the army members
+      seem to match the questers that show up shortly thereafter, looking for the indicated artifact. As with InvasionOrder armies, quester armies disappear on embark arrival.
+
+      VillainousVisit (24): Villainous visitors. Legitimate ones use Visit army controllers, but only until they arrive, while villainous ones linger.
     <struct-type type-name='army_controller' key-field='id'
                  instance-vector='$global.world.army_controllers.all'>
-        <int32_t name='id' comment="all army.controllers seen and reached via t2 controller's armies have been of type = t4 and absent from the 'all' vector"/>
+        <int32_t name='id' comment="all army.controllers seen and reached via InvasionOrder controllers' armies have been of type = Invasion and absent from the 'all' vector"/>
         <int32_t name="entity_id" ref-target='historical_entity'/>
-        <int32_t name='site_id' ref-target="world_site" comment="Looks like target site with type=t2. My fortress..."/>
+        <int32_t name='site_id' ref-target="world_site" comment="Invasion/Order: site to invade. Visit/Quest/VillainousVisit: site to 'visit'"/>
         <int32_t name='unk_1' init-value='-1'/>
-        <int32_t name='pos_x' comment="Look like the unit is map_block, i.e. 3 * 16 * world tile"/>
+        <int32_t name='pos_x' comment="Look like the unit is map_block, i.e. 3 * 16 * world tile. Position of target, which is the starting point for defeated invasions"/>
         <int32_t name='pos_y'/>
         <int32_t name="unk_18" comment="Seen one case of 1990 for VillainVisiting"/>
         <int32_t name="unk_1c" comment="same value for the same visitor"/>
         <stl-vector name='unk_20' type-name='int32_t'/>
         <int32_t name="year"/>
         <int32_t name="year_tick"/>
-        <int32_t name="unk_34"/>
-        <int32_t name='unk_38' comment="copy of the id seen here"/>
-        <int32_t name='master_hf' ref-target='historical_figure' comment="t2: Civ/sitegov master. t4: leader of the attack, can be in army nemesis vector"/>
-        <int32_t name='general_hf' ref-target='historical_figure' comment="t2:leader of the attack. t4: subordinate squad leader(?) in army nemesis vector. Can be same as master"/>
+        <int32_t name='unk_34' ref-target='army_controller' comment="id of other army controller (Invasion) from same entity seen here"/>
+        <int32_t name='unk_38' ref-target='army_controller' comment="copy of the id seen here, as well as a t7 for a t5 controller"/>
+        <int32_t name='master_hf' ref-target='historical_figure' comment="InvasionOrder: Civ/sitegov master. Invasion: leader of the attack, can be in army nemesis vector"/>
+        <int32_t name='general_hf' ref-target='historical_figure' comment="InvasionOrder:leader of the attack. Invasion: subordinate squad leader(?) in army nemesis vector. Can be same as master"/>
         <int32_t name="unk_44_1"/>
         <int32_t name="unk_44_2"/>
-        <int32_t name='visitor_nemesis_id' ref-target='nemesis_record' comment="Set for VillainVisiting"/>
-        <int32_t name='unk_44_4'/>
+        <int32_t name='visitor_nemesis_id' ref-target='nemesis_record' comment="Set for VillainousVisit"/>
+        <int32_t name='unk_44_4' comment="3, 6 seen for Villain"/>
         <pointer name="unk_44_5"/>
         <pointer name="unk_v47_1" comment="Could be before unk_44: haven't found any non zero unk_44"/>
         <pointer name="unk_v47_2"/>
@@ -391,34 +391,34 @@
         <stl-vector name="unk_54" type-name='int32_t'/>
         <stl-vector name='unk_44_11v' since='v0.44.11'/>
         <pointer name='mission_report' type-name='mission_report'/>
-        <compound name='unk_64' is-union='true'>
+        <compound name='data' is-union='true'>
             <pointer type-name='army_controller_sub1' name='t1'/>
-            <pointer type-name='army_controller_invasion' name='SentToInvade'/>
-            <pointer type-name='army_controller_sub4' name='t4'/>
+            <pointer type-name='army_controller_invasion_order' name='InvasionOrder'/>
+            <pointer type-name='army_controller_invasion' name='Invasion'/>
             <pointer type-name='army_controller_sub5' name='t5'/>
             <pointer type-name='army_controller_sub6' name='t6'/>
             <pointer type-name='army_controller_sub7' name='t7'/>
             <pointer type-name='army_controller_sub11' name='t11'/>
-            <pointer type-name='army_controller_sub12' name='SentToTributary'/>
+            <pointer type-name='army_controller_visit' name='Visit'/>
             <pointer type-name='army_controller_sub13' name='t13'/>
             <pointer type-name='army_controller_sub14' name='t14'/>
             <pointer type-name='army_controller_sub15' name='t15'/>
             <pointer type-name='army_controller_sub16' name='t16'/>
-            <pointer type-name='army_controller_sub17' name='t17'/>
+            <pointer type-name='army_controller_quest' name='Quest'/>
             <pointer type-name='army_controller_sub18' name='t18'/>
             <pointer name='t19'/>
             <pointer name='t20'/>
             <pointer name='t21'/>
             <pointer name='t22'/>
             <pointer name='t23'/>
-            <pointer type-name='army_controller_villain_visiting' name='VillainVisiting'/>
+            <pointer type-name='army_controller_villainous_visit' name='VillainousVisit'/>
         </compound>
         <enum name='type' base-type='int32_t'>
             <enum-item name='t0'/>
             <enum-item name='t1'/>
-            <enum-item name='SentToInvade'/>
+            <enum-item name='InvasionOrder'/>
             <enum-item name='t3'/>
-            <enum-item name='t4' comment="Seen on army_controller entries of armies referenced by t2 controllers (which do not refer to the t2 entries). These t4 entries are not in the 'all' vector"/>
+            <enum-item name='Invasion' comment="Seen on army_controller entries of armies referenced by InvasionOrder controllers (which do not refer to the InvasionOrder entries). These Invasion entries are not in the 'all' vector"/>
             <enum-item name='t5'/>
             <enum-item name='t6'/>
             <enum-item name='t7'/>
@@ -426,19 +426,19 @@
             <enum-item name='t9'/>
             <enum-item name='t10'/>
             <enum-item name='t11'/>
-            <enum-item name='SentToTributary'/>
+            <enum-item name='Visit' comment="Used both for regular visitors to a fortress and exiled characters sent to 'visit' other sites"/>
             <enum-item name='t13'/>
             <enum-item name='t14'/>
             <enum-item name='t15'/>
             <enum-item name='t16'/>
-            <enum-item name='t17' comment="seen for artifact questers"/>
+            <enum-item name='Quest' comment="Used to indicate artifact quests"/>
             <enum-item name='t18'/>
             <enum-item name='t19'/>
             <enum-item name='t20'/>
             <enum-item name='t21'/>
             <enum-item name='t22'/>
             <enum-item name='t23'/>
-            <enum-item name='VillainVisiting'/>
+            <enum-item name='VillainousVisit'/>
         </enum>
     </struct-type>
 
@@ -448,7 +448,7 @@
         <int32_t/>
     </struct-type>
 
-    <struct-type type-name='army_controller_invasion'>
+    <struct-type type-name='army_controller_invasion_order'>
         <int32_t name='unk_1'/>
         <int32_t name='unk_2'/>
         <int32_t name='unk_3'/>
@@ -470,22 +470,22 @@
         <int32_t name='unk_9'/>
     </struct-type>
 
-    <struct-type type-name='army_controller_sub4'>
+    <struct-type type-name='army_controller_invasion'>
         <int32_t name='unk_1'/>
         <bitfield name='unk_2'>
             <flag-bit name='not_sleeping' comment='set to 1 to make army wake up'/>
-            <flag-bit name='unk_2' comment='sen set on necro attack controller'/>
+            <flag-bit name='unk_2' comment='seen set on gobbo/necro attack controller'/>
             <flag-bit name='unk_3'/>
-            <flag-bit name='unk_4' comment='sen set on necro attack controller'/>
+            <flag-bit name='unk_4' comment='sen set on gobbo/necro attack controller'/>
         </bitfield>
     </struct-type>
 
     <struct-type type-name='army_controller_sub5'>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='pos_x' comment="in map_block coordinates. Same as those of the main struct seen"/>
+        <int32_t name='pos_y'/>
+        <int32_t name='unk_1' comment="0 seen"/>
+        <int32_t name='year'/>
+        <int32_t name='year_tick'/>
     </struct-type>
 
     <struct-type type-name='army_controller_sub6'>
@@ -501,9 +501,9 @@
     </struct-type>
 
     <struct-type type-name='army_controller_sub7'>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector>
+        <int32_t name='unk_1' init-value='-1'/>
+        <int32_t name='unk_2' init-value='-1'/>
+        <stl-vector name='unk_3'>
             <pointer>
                 <int32_t/>
                 <int32_t/>
@@ -513,34 +513,34 @@
                 <int32_t/>
             </pointer>
         </stl-vector>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_4' comment="0 seen"/>
+        <int32_t name='pos_x' comment="map_block coordinates. Same as those of the main struct seen"/>
+        <int32_t name='pos_y'/>
+        <int32_t name='unk_5' comment="0 seen"/>
+        <int32_t name='unk_6' init-value='-1'/>
+        <int32_t name='unk_7' init-value='-1'/>
+        <int32_t name='unk_8' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='army_controller_sub11'>
-        <int32_t/>
-        <int32_t/>
+        <int32_t name='unk_1' init-value='-1'/>
+        <int32_t name='unk_2' init-value='-1'/>
         <stl-vector>
-            <pointer>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
-                <int32_t/>
+            <pointer name='unk_3' comment="probably the same type as the corresponding one of army_controller_invasion_order">
+                <int32_t name='army_id' ref-target='army'/>
+                <int32_t name='pos_x_a' comment="map_block coordinates"/>
+                <int32_t name='pos_y_a'/>
+                <int32_t name='pos_x_b'/>
+                <int32_t name='pos_y_b'/>
+                <int32_t name='invasion_count' comment="very much a guess from one sample, but it matched the army size"/>
             </pointer>
         </stl-vector>
     </struct-type>
 
-    <struct-type type-name='army_controller_sub12'>
+    <struct-type type-name='army_controller_visit'>
         <int32_t name='unk_1' init-value='-1'/>
         <int32_t name='unk_2' init-value='-1'/>
-        <int32_t name='unk_3' init-value='0'/>
+        <int32_t name='unk_3' init-value='0' comment="2 seen on exiled character"/>
         <stl-vector name='unk_4'>
             <pointer>
                 <int32_t/>
@@ -553,8 +553,8 @@
         </stl-vector>
         <int32_t name='unk_5' init-value='-1'/>
         <int32_t name='unk_6' init-value='-1'/>
-        <int32_t name='unk_7' init-value='-1' comment="1 seen"/>
-        <int32_t name='unk_8' comment='41, 42, 56 seen. 42 seems to be visiting performer, 56 petitioning performer, and 41 might be petitioning monster slayers'/>
+        <int32_t name='abstract_building' init-value='-1' comment="Monster slayers have -1"/>
+        <enum name='purpose' type-name='history_event_reason' base-type='int32_t'/>
     </struct-type>
 
     <struct-type type-name='army_controller_sub13'>
@@ -618,11 +618,11 @@
         <int32_t/>
     </struct-type>
 
-    <struct-type type-name='army_controller_sub17'>
+    <struct-type type-name='army_controller_quest'>
         <int32_t name='artifact_id' ref-target="artifact_record"/>
-        <int32_t init-value='-1'/>
-        <int32_t init-value='-1'/>
-        <int32_t/>
+        <int32_t name='unk_1' init-value='-1'/>
+        <int32_t name='unk_2' init-value='-1'/>
+        <int32_t name='unk_3'/>
     </struct-type>
 
     <struct-type type-name='army_controller_sub18'>
@@ -630,11 +630,11 @@
         <int32_t/>
     </struct-type>
 
-    <struct-type type-name='army_controller_villain_visiting'>
+    <struct-type type-name='army_controller_villainous_visit'>
         <int32_t name='site_id' ref-target='world_site'/>
         <int32_t name='entity_id' ref-target='historical_entity'/>
-        <int32_t name='abstract_building' comment="abstract building. Seems to be -1 before arrival"/>
-        <int32_t comment="44 seen for scholar, 61 for tavern visitors. Seems to be -1 before arrival"/>
+        <int32_t name='abstract_building' comment="-1 before arrival"/>
+        <enum name='purpose' type-name='history_event_reason' base-type='int32_t' comment="none before arrival"/>
     </struct-type>
 
     <enum-type type-name='army_flags'>
@@ -643,68 +643,68 @@
 
     <struct-type type-name='army' key-field='id'
                  instance-vector='$global.world.armies.all'>
-        <int32_t name="id"/>
-        <compound type-name='coord' name="pos"/>
-        <compound type-name='coord' name="last_pos"/> guess
-        <int16_t name="unk_10"/>
-        <int32_t name="unk_14"/>
-        <int32_t name="unk_18"/>
-        <stl-vector name="members">
+        <int32_t name='id'/>
+        <compound name='pos' type-name='coord'/>
+        <compound name='last_pos' type-name='coord'/>
+        <int16_t name='unk_10' init-value='0' comment="1, 2, 5, 10, 15, 20, 21 seen"/>
+        <int32_t name='unk_14' init-value='0' comment="When set, large value like army or army_controller id, but no match found"/>
+        <int32_t name='unk_18' init-value='0'/>
+        <stl-vector name='members'>
             <pointer>
-                <int32_t name="nemesis_id" init-value='-1'/>
-                <int32_t name="hunger_timer"/>
-                <int32_t name="thirst_timer"/>
-                <int32_t name="sleepiness_timer"/>
-                <int32_t name="stored_fat"/>
-                <int32_t name="unk_14"/>
-                <int32_t name="unk_18"/>
-                <int32_t name="unk_1c" init-value='-1000000'/>
-                <int32_t name="unk_20" init-value='-1000000'/>
-                <int32_t name="unk_24" init-value='-1000000'/>
-                <int32_t name="unk_28"/>
-                <int32_t since='v0.44.01'/>
-                <int32_t name="unk_2c" init-value='100'/>
-                <int32_t name="unk_30"/>
-                <int32_t name="unk_34"/>
-                <stl-vector name="unk_38"/>
+                <int32_t name='nemesis_id' init-value='-1'/>
+                <int32_t name='hunger_timer'/>
+                <int32_t name='thirst_timer'/>
+                <int32_t name='sleepiness_timer'/>
+                <int32_t name='stored_fat'/>
+                <int32_t name='unk_14'/>
+                <int32_t name='unk_18'/>
+                <int32_t name='unk_1c' init-value='-1000000'/>
+                <int32_t name='unk_20' init-value='-1000000'/>
+                <int32_t name='unk_24' init-value='-1000000'/>
+                <int32_t name='unk_28'/>
+                <int32_t name='unk_1' since='v0.44.01'/>
+                <int32_t name='unk_2c' init-value='100'/>
+                <int32_t name='unk_30'/>
+                <int32_t name='unk_34'/>
+                <stl-vector name='unk_38'/>
                 <int32_t name='unk_v42_1' since='v0.42.01'/>
-                <int32_t init-value='-1' since='v0.47.01'/>
-                <int32_t 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_2c">
+        <stl-vector name='squads'>
             <pointer>
-                <int32_t name="count"/> next five checks out in created units
-                <int32_t name="race"/>
-                <int32_t name="population_id"/>
-                <int32_t name="civ_id"/>
-                <int32_t name="unk_10"/> same as unk_c0 in unit
-                <int32_t name="cultural_identity"/>
-                <int32_t name="unk_18"/> made creatures undead, so not sure maybe affliction?
-                <int32_t name="unk_1c"/> crashed df...
-                <int32_t name="unk_20"/>
-                <int32_t name="unk_24"/>
-                <int32_t name="unk_28"/>
+                <int32_t name='count'/> next five checks out in created units
+                <int32_t name='race'/>
+                <int32_t name='population_id'/>
+                <int32_t name='entity_id' ref-target='historical_entity'/>
+                <int32_t name='unk_10' init-value='-1'/> same as unk_c0 in unit
+                <int32_t name='cultural_identity'/>
+                <int32_t name='unk_18' init-value='-1' comment="in range for nemesis id, but probably something else"/> made creatures undead, so not sure maybe affliction?
+                <int32_t name='unk_1c' init-value='-1' comment="also seen 0"/> crashed df...
+                <int32_t name='subordinate_entity_id' ref-target='historical_entity' comment="usually None, sometimes same as entity_id, sometimes subordinate of entity_id (like site government to civ)"/>
+                <int32_t name='unk_24' init-value='-1' comment="0/1 seen"/>
+                <int32_t name='unk_28' init-value='-1'/>
             </pointer>
         </stl-vector>
-        <int32_t name="unk_3c"/>
-        <int32_t since='v0.44.01'/>
-        <int32_t since='v0.47.03'/>
-        <int32_t name="controller_id" ref-target='army_controller'/>
-        <pointer name="controller" type-name="army_controller"/>
-        <df-flagarray name="flags" index-enum='army_flags'/>
-        <stl-vector name="unk_pos_x" type-name="int32_t"/> probably path
-        <stl-vector name="unk_pos_y" type-name="int32_t"/>
-        <stl-vector name="unk_70" type-name="int32_t"/>
-        <stl-vector name="unk_80" type-name="int32_t"/>
-        <int32_t name="unk_90"/>
-        <int32_t name="unk_94"/>
-        <int32_t name="unk_98"/>
-        <int32_t name="unk_9c"/>
-        <int32_t name="unk_a0"/>
-        <int32_t name="unk_a4"/>
+        <int32_t name='unk_3c'/>
+        <int32_t name='unk_1' since='v0.44.01'/>
+        <int32_t name='unk_2' since='v0.47.03' comment="16 only value seen"/>
+        <int32_t name='controller_id' ref-target='army_controller'/>
+        <pointer name='controller' type-name="army_controller"/>
+        <df-flagarray name='flags' index-enum='army_flags'/>
+        <stl-vector name='block_path_x' type-name='int32_t' comment="path in map_block coordinates. Seems to be the near term"/>
+        <stl-vector name='block_path_y' type-name='int32_t'/>
+        <stl-vector name='path_x' type-name='int32_t' comment="path in world coordinates. Seems to be the extension beyond those laid out in block_path_x/y"/>
+        <stl-vector name='path_y' type-name='int32_t'/>
+        <int32_t name='unk_90' init-value='-1'/>
+        <int32_t name='unk_94' init-value='-1' comment="Number counting down. In examined save starts at 80 for id 38 counting down to 0 at 113, obviously with missing numbers somewhere"/>
+        <int32_t name='unk_98' init-value='-1'/>
+        <int32_t name='unk_9c' comment="10, 50, 90, 100 seen"/>
+        <int32_t name='unk_a0' comment='0, 50, 90, 1000 seen'/>
+        <int32_t name='unk_a4' comment="0, 100, 10000 seen"/>
         <stl-vector name='unk_a8' pointer-type='stl-string' comment='also creature class?'/>
-        <stl-vector name='creature_class' pointer-type='stl-string'/>
+        <stl-vector name='creature_class' pointer-type='stl-string' comment="Usually 'GENERAL_POISON' and 'MAMMAL'. Seen something else for undead"/>
         <enum type-name='item_type' base-type='int16_t' name='item_type'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
diff --git a/df.ui.xml b/df.ui.xml
index 0fa88d713..62e91d405 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -175,14 +175,14 @@
             <int8_t name='guard_lack_complained'/>
         </compound>
 
-        <int32_t/>
+        <int32_t name='unk_1'/>
         <int32_t name='manager_cooldown' comment='0-1008'/>
         <int32_t name='bookkeeper_cooldown' comment='0-1008'/>
         <int32_t name='bookkeeper_precision'/>
         <int16_t name='bookkeeper_settings'/> noble bookkeeper precision: 10/100/1000/10000/all_accurate
 
         <stl-vector name='caravans' pointer-type='caravan_state'/>
-        <int8_t/>
+        <int8_t name='unk_2'/>
         <int16_t name='fortress_rank'/> outpost/hamlet/village/town/city/metropolis
         <int16_t name='progress_population' comment='?'/> (unles that's what the above is)
         <int16_t name='progress_trade' comment='?'/>
@@ -194,8 +194,8 @@
         <bool name='ignore_labor_shortage'/>
         <bool name='justice_active'/>
 
-        <uint16_t init-value='60001'/>
-        <uint16_t init-value='60001'/>
+        <uint16_t name='unk_3' init-value='60001'/>
+        <uint16_t name='unk_4' init-value='60001'/>
         <int16_t name='manager_timer'/>
         <compound name='becoming_capital'>
             <int32_t name='desired_architecture'/>
@@ -205,7 +205,7 @@
         <stl-vector name='currency_value' type-name='int32_t'
                     index-refers-to='(material-by-id 0 $)'/>
         <int32_t name='trees_removed'/>
-        <int32_t/>
+        <int32_t name='unk_5'/>
         <int32_t name='fortress_age' comment='?; +1 per 10; used in first 2 migrant waves etc'/>
         <compound name='tasks' type-name='entity_activity_statistics'/>
 
@@ -530,11 +530,11 @@
         </compound>
 
         <stl-vector name='petitions' type-name='int32_t' comment='related to agreements'/>
-        <stl-vector since='v0.47.01'/>
+        <stl-vector name='unk_6' type-name='int32_t' since='v0.47.01' comment="observed allocating 4 bytes"/>
 
-        <stl-vector since='v0.44.01'/>
+        <stl-vector name='unk_7' since='v0.44.01'/>
 
-        <stl-vector since='v0.47.01' comment='related to (job_type)0xf1'>
+        <stl-vector name='unk_8' since='v0.47.01' comment='related to (job_type)0xf1'>
             <pointer>
                 <int32_t ref-target='item'/>
                 <int32_t ref-target='historical_figure'/>
@@ -571,9 +571,9 @@
             </pointer>
         </stl-vector>
 
-        <stl-vector since='v0.47.01'/>
-        <stl-vector since='v0.47.01'/>
-        <stl-vector since='v0.47.01'/>
+        <stl-vector name='unk_9' since='v0.47.01'/>
+        <stl-vector name='unk_10' since='v0.47.01'/>
+        <stl-vector name='unk_11' since='v0.47.01'/>
 
         <compound name='main'>
             <static-array name='hotkeys' type-name='ui_hotkey' count='16'/>
diff --git a/df.units.xml b/df.units.xml
index 7cbafad7a..abec1c4e7 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -2251,6 +2251,7 @@
             <enum-item name='NeedWeapons' comment='no longer used'/>
             <enum-item name='IsAngry'/>
             <enum-item name='IsSad'/>
+            --  30
             <enum-item/>
             <enum-item/>
             <enum-item/>
@@ -2261,6 +2262,7 @@
             <enum-item/>
             <enum-item/>
             <enum-item/>
+            --  40
             <enum-item/>
             <enum-item/>
             <enum-item/>
@@ -2270,6 +2272,55 @@
             <enum-item/>
             <enum-item/>
             <enum-item name='Petition'/>
+            <enum-item/>
+            --  50
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            --  60
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            --  70
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            --  80
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            --  90
+            <enum-item/>
+            <enum-item/>
+            <enum-item comment="Seen on stressed dorf meeting priest (resulting in yelling at a priest). guild=-1, 'age'=1583 with no reasonable match found (in particular not religion)"/>
         </enum>
         <enum base-type='int16_t' type-name='guild_id' name="guild"/>
         <int32_t name='age'/>
diff --git a/df.world-data.xml b/df.world-data.xml
index a90112005..1960c41f2 100644
--- a/df.world-data.xml
+++ b/df.world-data.xml
@@ -66,7 +66,7 @@
             </code-helper>
         </int32_t>
 
-        <enum base-type='int16_t' name='depth' type-name='layer_type'/>
+        <enum base-type='int16_t' name='depth' type-name='layer_type' comment="Doesn't look correct. See -1, 0, 41, 172, 508, and 686 with critters visible in all caverns. Some dead, but the dorf on the surface isn't"/>
     </struct-type>
 
     <struct-type type-name='local_population'>
@@ -574,7 +574,7 @@
         <int16_t name="elevation" comment='0-99=Ocean, 150+=Mountains, 100-149: all other biomes. Note that PSV elevation uses 100-299 for normal biomes, with range later cut to 1/4, and Mountains shifted down'/>
         <int16_t name="rainfall" comment='0-100'/>
         <int16_t name="vegetation" comment='0-100'/>
-        <int16_t name="temperature" comment='Urists. 10000 Urists=0 Celsius'/>
+        <int16_t name="temperature" comment="Urists. 10000 Urists=0 Celsius. Urist steps equals Fahrenheit steps, which is equal to 5/9 Celsius steps"/>
         <int16_t name="evilness" comment='0-32=Good, 33-65=Neutral, 66-100=Evil'/>
         <int16_t name="drainage" comment='0-100'/>
         <int16_t name="volcanism" comment='0-100'/>
@@ -661,7 +661,7 @@
 
     <struct-type type-name='world_object_data'
                  instance-vector='$global.world.world_data.object_data' key-field='id'>
-        <int32_t name="id"/>
+        <int32_t name='id' comment="World MLT of the data according to: i + x * 16 + k * 16 * world_width + y * 256 * world_width, where (x, y) is the world tile and (i, k) the MLT within it"/>
         <stl-vector name="altered_items" type-name='int32_t' comment='world_data_subid'/>
         <stl-vector name="offloaded_items">
             <pointer>
@@ -691,7 +691,7 @@
         </stl-vector>
         <stl-vector name="unk_94">
             <pointer>
-                <int32_t name="global_x" comment='in tiles it seems'/>
+                <int32_t name="global_x" comment='in in-game tiles it seems'/>
                 <int32_t name="global_y"/>
                 <int32_t name="global_z"/>
                 <int32_t name="unk_c"/>
@@ -702,19 +702,21 @@
         <int32_t name="year"/>
         <int32_t name="year_tick"/>
 
-        -- v0.40.14:
-        <stl-vector name='unk_c0' type-name='int16_t' comment="6 bytes allocated seen. Cannot be pointer"/>
-        <stl-vector name="unk_d0" type-name='int16_t' comment="6 bytes allocated seen. Cannot be pointer"/>
-        <stl-vector name="unk_e0" type-name='int16_t' comment="6 bytes allocated seen. Cannot be pointer. Seen on the same element, so c0, d0, and e0 may be connected"/>
-        <stl-vector name="unk_f0"/>
-        <stl-vector name="unk_100"/>
-        <stl-vector name="unk_110"/>
-
-        -- v0.43.01
-        <stl-vector name='unk_v43_1'/>
-        <stl-vector name='unk_v43_2'/>
-        <stl-vector name='unk_v43_3'/>
-        <stl-vector name='unk_v43_4'/>
+        <compound name='picked_growths' since='v0.40.14' comment="also includes 'automatically picked' i.e. fallen fruit that becomes item_spatter. Doesn not seem to be used by Adventurer mode">
+            <stl-vector name='x' type-name='int16_t' comment="0 - 47, within the MLT"/>
+            <stl-vector name='y' type-name='int16_t' comment="0 - 47, within the MLT"/>
+            <stl-vector name='z' type-name='int16_t' comment="z coordinate using the elevation coordinate system"/>
+            <stl-vector name='subtype' type-name='int32_t' comment="subtype of the growth picked within the raws of the implicit plant"/>
+            <stl-vector name='density' type-name='int32_t' comment="copy of the density field of the growth raws"/>
+            <stl-vector name='year' type-name='int32_t' comment="presumably to know whether it's the current year's harvest or the previous one's"/>
+        </compound>
+
+        <compound name='unk_v43' since='v0.43.01' comment="probably used by Adventurer mode">
+            <stl-vector name='x' type-name='int16_t' comment="probably MLT relative x coordinate"/>
+            <stl-vector name='y' type-name='int16_t' comment="probably MLT relative y coordinate"/>
+            <stl-vector name='z' type-name='int16_t' comment="probably z coordinate using the elevation coordinate system"/>
+            <stl-vector name='unk_4' type-name='int32_t' comment="233/234 seen"/>
+        </compound>
     </struct-type>
 
     <enum-type type-name='mountain_peak_flags'>
@@ -1017,21 +1019,28 @@
         <stl-vector name='event_collections' type-name="int32_t" ref-target='history_event_collection'/>
     </struct-type>
 
-    <struct-type type-name='region_weather' key-field='id' instance-vector='$global.world.world_data.region_weather'>
+    <enum-type type-name='region_weather_type' base-type='int32_t'>
+        <enum-item name='CreepingGas'/>
+        <enum-item name='CreepingVapor' comment="doesn't seem to be generated by DF, but appears if hacked"/>
+        <enum-item name='CreepingDust'/>
+        <enum-item name='FallingMaterial' comment="a.k.a. rain, both blood and syndrome, but not regular"/>
+    </enum-type>
+    
+    <struct-type type-name='region_weather' key-field='id' instance-vector='$global.world.world_data.region_weather' comment="only evil weather, not the regular kind">
         <int32_t name='id'/>
-        <int32_t name="unk_4"/>
+        <enum name='type' type-name='region_weather_type' base-type='int32_t' comment="Creeping Gas/Vapor/Dust='cloud' below, FallingMaterial='rain'"/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <int32_t name="unk_10"/>
-        <int32_t name="region_x"/>
-        <int32_t name="region_y"/>
-        <int32_t name="unk_1c" init-value='-30000'/>
-        <int32_t name="unk_20" init-value='-30000'/>
-        <int32_t name="unk_24" init-value='-30000'/>
-        <int32_t name="unk_28"/>
-        <int32_t name="unk_2c"/>
-        <int32_t name="unk_30"/>
-        <int32_t name="unk_34" init-value='-1'/>
+        <bool name='announcement' comment="Guess based on seeing it appear for an entry when hitting the embark, resulting in an announcement"/>
+        <int32_t name='region_x' comment="world tile, used with evil rain. Probably uninitialized with cloud"/>
+        <int32_t name='region_y' comment="world tile, used with evil rain. Probably uninitialized with cloud"/>
+        <int32_t name='world_in_game_x' init-value='-30000' comment="used with evil clouds, indicating global in-game coordinates"/>
+        <int32_t name='world_in_game_y' init-value='-30000' comment="used with evil clouds, indicating global in-game coordinates"/>
+        <int32_t name='world_in_game_z' init-value='-30000' comment="probably never used, as weather appears on the surface"/>
+        <int32_t name='cloud_x_movement' comment="-1/0/1, indicating the movement per 10 ticks in X direction. Uninitialized for rain"/>
+        <int32_t name='cloud_y_movement' comment="-1/0/1, indicating the movement per 10 ticks in Y direction. Uninitialized for rain"/>
+        <int32_t name='remaining_duration' comment="ticks down 1 every 10 ticks. Removed some time after reaching 0. Cloud duration seems to start with a fairly large, but somewhat random value"/>
+        <int32_t name='region_id' ref-target='world_region' comment="Set for clouds, -1 for rain"/>
     </struct-type>
 </data-definition>
 
diff --git a/df.world-site.xml b/df.world-site.xml
index 61b12c7b8..c1ed160e8 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -476,8 +476,8 @@
                 <int32_t name="race"/>
                 <int32_t name="entity_id" ref-target='historical_entity' comment="failed to see any connections between these entities and the sites. Might be something else"/>
                 <int32_t name="unk_c"/>
-                <int32_t name="unk_10"/>
-                <int32_t name="unk_14"/>
+                <int32_t name='unk_10' comment="might be start year"/>
+                <int32_t name='unk_14' comment="might be end year"/>
                 <int32_t name="unk_18"/>
                 <int32_t name="unk_1c"/>
             </pointer>
@@ -560,22 +560,22 @@
 
         <int32_t name='unk_v40_5' comment='constant -1?' since='v0.40.01'/>
 
-        <pointer name="unk_188" comment="Seen monster in lair, first settler in site, killed defender in site">
+        <pointer name="unk_188" comment="Seen monster in lair, first settler in site, killed defender in site, artifact created in player fortress, (player) created artifact claimed by villain for unrelated cave/villain settled in cave">
             <stl-vector>
                 <pointer>
-                    <int32_t comment="looks random"/>
-                    <int32_t init-value='0'/>
-                    <int32_t init-value='0'/>
-                    <int32_t comment="might be year"/>
+                    <int32_t name='unk_2' comment="looks random"/>
+                    <int32_t name='unk_3' init-value='0'/>
+                    <int32_t name='unk_4' init-value='0'/>
+                    <int32_t name='unk_5' comment="might be year"/>
                     <compound name='unk1'>
-                        <int32_t/>
-                        <int32_t/>
+                        <int32_t name='unk_1'/>
+                        <int32_t name='unk_2' init-value='-1'/>
                         <int32_t name='hfid' ref-target='historical_figure'/>
-                        <int32_t/>
+                        <int32_t name='artifact_id' ref-target='artifact_record'/>
                         <int32_t name='site_id' ref-target='world_site'/>
                     </compound>
-                    <int32_t init-value='-1' comment="1, 2, 3, 11 seen"/>
-                    <int32_t init-value='-1'/>
+                    <int32_t name='unk_6' init-value='-1' comment="1, 2, 3, 5, 11 seen"/>
+                    <int32_t name='unk_7' init-value='-1'/>
                 </pointer>
             </stl-vector>
         </pointer>
diff --git a/df.world.xml b/df.world.xml
index 091a85f0f..82d31d19b 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -300,7 +300,8 @@
         <int32_t name='incident_id' ref-target='incident'/>
         <int32_t name='crime_id' ref-target='crime'/>
         <enum name='witness_claim'>
-            <enum-item name='FoundTheBody' value='1'/>
+            <enum-item name='SawDisorderlyConduct'/>
+            <enum-item name='FoundTheBody'/>
             <enum-item name='SawObjectWasMissing'/>
             <enum-item name='SawObjectWasDisturbed'/>
             <enum-item name='SawSomebodyAdmireObject'/>
@@ -1566,36 +1567,36 @@
         <stl-vector name='unk_131ec0' since='v0.42.01'>
             <pointer> The first value in a pair is always less/equal to the higher one, and the first value of the corresponding pair in the next vector
                       element is always greater/equal to the second one of the previous entry. Looks like first/last values for something.
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_1'/>
+                <int32_t name='unk_2'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_3'/>
+                <int32_t name='unk_4'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_5'/>
+                <int32_t name='unk_6'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_7'/>
+                <int32_t name='unk_8'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_9'/>
+                <int32_t name='unk_10'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_11'/>
+                <int32_t name='unk_12'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_13'/>
+                <int32_t name='unk_14'/>
 
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_15'/>
+                <int32_t name='unk_16'/>
             </pointer>
         </stl-vector>
         <stl-vector name='languages' since='v0.40.01'> DWARF ELF GOBLIN HUMAN
             <pointer>
                 <stl-string name='name'/>
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='unk_1'/>
+                <int32_t name='unk_2'/>
             </pointer>
         </stl-vector>
         <stl-vector name='unk_131ef0' since='v0.44.01'>
@@ -1604,15 +1605,15 @@
                 <stl-vector name='claims'>
                     <pointer>
                         <int32_t name='artifact' ref-target='artifact_record'/>
-                        <int32_t comment="only seen 1, and only family heirloom..."/>
+                        <int32_t name='unk_1' comment="only seen 1, and only family heirloom..."/>
                         <int32_t name='year' comment="matches up with creation or a claim..."/>
                         <int32_t name='year_tick' init-value='-1'/>
-                        <int32_t init-value='-1' comment="only seen -1"/>
+                        <int32_t name='unk_2' init-value='-1' comment="only seen -1"/>
                     </pointer>
                 </stl-vector>
                 <int32_t name='unk_hfid' ref-target='historical_figure' comment="hfid or completely unrelated hf seen?"/>
-                <int32_t init-value='0' comment="only seen 0"/>
-                <int32_t init-value='0' comment="only seen 0"/>
+                <int32_t name='unk_1' init-value='0' comment="only seen 0"/>
+                <int32_t name='unk_2' init-value='0' comment="only seen 0"/>
             </pointer>
         </stl-vector>