diff --git a/df.job-types.xml b/df.job-types.xml
index b4b49fc08..3ff1ec200 100644
--- a/df.job-types.xml
+++ b/df.job-types.xml
@@ -1,6 +1,7 @@
 <data-definition>
     <enum-type type-name='job_type_class' comment='not in DF'>
         <enum-item name='Misc'/>
+        <enum-item name='Digging'/>
         <enum-item name='Building'/>
         <enum-item name='Hauling'/>
         <enum-item name='LifeSupport'/>
@@ -13,6 +14,7 @@
         <enum-item name='LawEnforcement'/>
         <enum-item name='StrangeMood'/>
         <enum-item name='UnitHandling'/>
+        <enum-item name='SiegeWeapon'/>
         <enum-item name='Medicine'/>
     </enum-type>
 
@@ -23,6 +25,8 @@
         <enum-attr name='type' type-name='job_type_class' default-value='Misc'/>
         <enum-attr name='labor' type-name='unit_labor' default-value='NONE'/>
         <enum-attr name='item' type-name='item_type' default-value='NONE'/>
+        <enum-attr name='possible_item' type-name='item_type' is-list='true'/>
+        <enum-attr name='possible_material' is-list='true'/>
         <enum-attr name='skill' type-name='job_skill' default-value='NONE'/>
         <enum-attr name='skill_stone' type-name='job_skill' default-value='NONE'/>
         <enum-attr name='skill_wood' type-name='job_skill' default-value='NONE'/>
@@ -32,7 +36,7 @@
 
         <enum-item name='CarveFortification'>
             <item-attr name='caption' value="Carve Fortification"/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='DetailWall'>
@@ -47,32 +51,32 @@
         </enum-item>
         <enum-item name='Dig'>
             <item-attr name='caption' value='Dig'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='CarveUpwardStaircase'>
             <item-attr name='caption' value='Carve Upward Staircase'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='CarveDownwardStaircase'>
             <item-attr name='caption' value='Carve Downward Staircase'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='CarveUpDownStaircase'>
             <item-attr name='caption' value='Carve Up/Down Staircase'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='CarveRamp'>
             <item-attr name='caption' value='Carve Ramp'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='DigChannel'>
             <item-attr name='caption' value='Dig Channel'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='FellTree'>
@@ -269,14 +273,14 @@
         </enum-item>
         <enum-item name='GoShopping'>
             <item-attr name='caption' value='Go Shopping'/>
-            <item-attr name='type' value='Leisure'/>
+            <item-attr name='type' value='LifeSupport'/>
         </enum-item>
 
         -- 50
 
         <enum-item name='GoShopping2'>
             <item-attr name='caption' value='Go Shopping'/>
-            <item-attr name='type' value='Leisure'/>
+            <item-attr name='type' value='LifeSupport'/>
         </enum-item>
         <enum-item name='Clean'>
             <item-attr name='caption' value='Clean'/>
@@ -288,7 +292,7 @@
         </enum-item>
         <enum-item name='PickupEquipment'>
             <item-attr name='caption' value='Pickup Equipment'/>
-            <item-attr name='type' value='TidyUp'/>
+            <item-attr name='type' value='LifeSupport'/>
         </enum-item>
         <enum-item name='DumpItem'>
             <item-attr name='caption' value='Dump Item'/>
@@ -437,6 +441,12 @@
             <item-attr name='skill_wood' value='WOODCRAFT'/>
             <item-attr name='skill_stone' value='STONECRAFT'/>
             <item-attr name='skill_metal' value='METALCRAFT'/>
+            <item-attr name='possible_item' value='FIGURINE'/>
+            <item-attr name='possible_item' value='RING'/>
+            <item-attr name='possible_item' value='EARRING'/>
+            <item-attr name='possible_item' value='CROWN'/>
+            <item-attr name='possible_item' value='BRACELET'/>
+            <item-attr name='possible_item' value='SCEPTER'/>
         </enum-item>
         <enum-item name='MintCoins'>
             <item-attr name='caption' value='Mint Coins'/>
@@ -564,6 +574,8 @@
             <item-attr name='caption' value='Butcher an Animal'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='skill' value='BUTCHER'/>
+            <item-attr name='possible_item' value='MEAT'/>
+            <item-attr name='possible_item' value='CORPSEPIECE'/>
         </enum-item>
         <enum-item name='PrepareRawFish'>
             <item-attr name='caption' value='Prepare a Raw Fish'/>
@@ -580,6 +592,7 @@
         <enum-item name='BaitTrap'>
             <item-attr name='caption' value='Bait Trap'/>
             <item-attr name='type' value='Hauling'/>
+            <item-attr name='skill' value='TRAPPING'/>
         </enum-item>
         <enum-item name='MilkCreature'>
             <item-attr name='caption' value='Milk Creature'/>
@@ -630,6 +643,7 @@
             <item-attr name='caption' value='Weave Cloth'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='CLOTH'/>
+            <item-attr name='skill' value='WEAVING'/>
         </enum-item>
         <enum-item name='MakeGloves'>
             <item-attr name='caption' value='Make Gloves'/>
@@ -663,7 +677,7 @@
             <item-attr name='skill_metal' value='METALCRAFT'/>
         </enum-item>
         <enum-item name='MakeFlask'>
-            <item-attr name='caption' value='Forge/Make Waterskin/Vial/Flask'/>
+            <item-attr name='caption' value='Make Flask'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='FLASK'/>
             <item-attr name='skill_metal' value='METALCRAFT'/>
@@ -672,18 +686,24 @@
             <item-attr name='caption' value='Make Goblet'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='GOBLET'/>
+            <item-attr name='skill_wood' value='WOODCRAFT'/>
+            <item-attr name='skill_stone' value='STONECRAFT'/>
             <item-attr name='skill_metal' value='METALCRAFT'/>
         </enum-item>
         <enum-item name='MakeInstrument'>
             <item-attr name='caption' value='Make Instrument'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='INSTRUMENT'/>
+            <item-attr name='skill_wood' value='WOODCRAFT'/>
+            <item-attr name='skill_stone' value='STONECRAFT'/>
             <item-attr name='skill_metal' value='METALCRAFT'/>
         </enum-item>
         <enum-item name='MakeToy'>
             <item-attr name='caption' value='Make Toy'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='TOY'/>
+            <item-attr name='skill_wood' value='WOODCRAFT'/>
+            <item-attr name='skill_stone' value='STONECRAFT'/>
             <item-attr name='skill_metal' value='METALCRAFT'/>
         </enum-item>
         <enum-item name='MakeAnimalTrap'>
@@ -713,12 +733,15 @@
         <enum-item name='MakeTotem'>
             <item-attr name='caption' value='Make Totem'/>
             <item-attr name='type' value='Manufacture'/>
+            <item-attr name='skill' value='BONECARVE'/>
             <item-attr name='item' value='TOTEM'/>
         </enum-item>
         <enum-item name='MakeAmmo'>
             <item-attr name='caption' value='Make Ammo'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='AMMO'/>
+            <item-attr name='skill_wood' value='WOODCRAFT'/>
+            <item-attr name='skill_stone' value='STONECRAFT'/>
             <item-attr name='skill_metal' value='FORGE_WEAPON'/>
         </enum-item>
         <enum-item name='DecorateWith'>
@@ -749,16 +772,17 @@
         </enum-item>
         <enum-item name='LoadCatapult'>
             <item-attr name='caption' value='Load Catapult'/>
-            <item-attr name='type' value='Hauling'/>
+            <item-attr name='type' value='SiegeWeapon'/>
             <item-attr name='skill' value='SIEGEOPERATE'/>
         </enum-item>
         <enum-item name='LoadBallista'>
             <item-attr name='caption' value='Load Ballista'/>
-            <item-attr name='type' value='Hauling'/>
+            <item-attr name='type' value='SiegeWeapon'/>
             <item-attr name='skill' value='SIEGEOPERATE'/>
         </enum-item>
         <enum-item name='FireCatapult'>
             <item-attr name='caption' value='Fire Catapult'/>
+            <item-attr name='type' value='SiegeWeapon'/>
             <item-attr name='skill' value='SIEGEOPERATE'/>
         </enum-item>
 
@@ -766,6 +790,7 @@
 
         <enum-item name='FireBallista'>
             <item-attr name='caption' value='Fire Ballista'/>
+            <item-attr name='type' value='SiegeWeapon'/>
             <item-attr name='skill' value='SIEGEOPERATE'/>
         </enum-item>
         <enum-item name='ConstructMechanisms'>
@@ -823,16 +848,19 @@
         <enum-item name='ExtractFromPlants'>
             <item-attr name='caption' value='Extract from Plants'/>
             <item-attr name='type' value='Manufacture'/>
+            <item-attr name='possible_item' value='LIQUID_MISC'/>
             <item-attr name='skill' value='HERBALISM'/>
         </enum-item>
         <enum-item name='ExtractFromRawFish'>
             <item-attr name='caption' value='Extract from Raw Fish'/>
             <item-attr name='type' value='Manufacture'/>
+            <item-attr name='possible_item' value='LIQUID_MISC'/>
             <item-attr name='skill' value='DISSECT_FISH'/>
         </enum-item>
         <enum-item name='ExtractFromLandAnimal'>
             <item-attr name='caption' value='Extract from Land Animal'/>
             <item-attr name='type' value='Manufacture'/>
+            <item-attr name='possible_item' value='LIQUID_MISC'/>
             <item-attr name='skill' value='DISSECT_VERMIN'/>
         </enum-item>
         <enum-item name='TameVermin'>
@@ -914,6 +942,7 @@
         <enum-item name='CleanPatient'>
             <item-attr name='caption' value='Clean Patient'/>
             <item-attr name='type' value='Medicine'/>
+            <item-attr name='labor' value='CLEAN'/>
         </enum-item>
         <enum-item name='Surgery'>
             <item-attr name='caption' value='Surgery'/>
@@ -986,6 +1015,8 @@
             <item-attr name='caption' value='Slaughter Animal'/>
             <item-attr name='type' value='Gathering'/>
             <item-attr name='skill' value='BUTCHER'/>
+            <item-attr name='possible_item' value='MEAT'/>
+            <item-attr name='possible_item' value='CORPSEPIECE'/>
         </enum-item>
         <enum-item name='MakeCharcoal'>
             <item-attr name='caption' value='Make Charcoal'/>
@@ -1073,7 +1104,7 @@
         </enum-item>
         <enum-item name='RemoveStairs'>
             <item-attr name='caption' value='Remove Stairs/Ramps'/>
-            <item-attr name='type' value='Building'/>
+            <item-attr name='type' value='Digging'/>
             <item-attr name='skill' value='MINING'/>
         </enum-item>
         <enum-item name='ConstructQuern'>
@@ -1138,6 +1169,9 @@
         </enum-item>
         <enum-item name='ShearCreature'>
             <item-attr name='caption' value='Shear Creature'/>
+            <item-attr name='type' value='Gathering'/>
+            <item-attr name='item' value='CORPSEPIECE'/>
+            <item-attr name='skill' value='SHEARING'/>
         </enum-item>
         <enum-item name='SpinThread'>
             <item-attr name='caption' value='Spin Thread'/>
@@ -1160,6 +1194,8 @@
             <item-attr name='caption' value='Make Tool'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='TOOL'/>
+            <item-attr name='skill_wood' value='WOODCRAFT'/>
+            <item-attr name='skill_stone' value='STONECRAFT'/>
         </enum-item>
         <enum-item name='CollectClay'>
             <item-attr name='caption' value='Collect Clay'/>
diff --git a/df.meeting.xml b/df.meeting.xml
index 48e5dc800..ed3f23ef9 100644
--- a/df.meeting.xml
+++ b/df.meeting.xml
@@ -23,7 +23,10 @@
     <struct-type type-name='meeting_ref'>
         <int32_t name='unk1'
                  comment='4 person, 7 pet (pet), 8 pet (owner)'/>
-        <pointer name='ptr' comment='type varies'/>
+        <compound is-union='true'>
+            <pointer name='diplomat' type-name='meeting_diplomat'/>
+            <pointer name='pet' type-name='meeting_pet'/>
+        </compound>
         <int32_t name='unk2' comment='0'/>
     </struct-type>
 
diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
index f5c9fe0d3..22e77b1d9 100644
--- a/df.reaction-raws.xml
+++ b/df.reaction-raws.xml
@@ -6,7 +6,7 @@
     </enum-type>
 
     <struct-type type-name='reaction'
-                instance-vector='$global.world.raws.reactions' key-field='id'>
+                instance-vector='$global.world.raws.reactions'>
         <stl-string name="code"/>
         <stl-string name="name"/>
 
@@ -35,7 +35,7 @@
             <stl-vector type-name='int32_t' name='hotkey'/>
         </compound>
 
-        <int32_t name="id"/>
+        <int32_t name="index"/>
     </struct-type>
 
     <class-type type-name='reaction_reagent' original-name='reaction_reagentst'>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index f893c9061..e2a3d6568 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -279,7 +279,7 @@
     </struct-type>
 
     <struct-type type-name='ui_look_list'>
-        <stl-vector name='items' has-bad-pointers='true'>
+        <stl-vector name='items'>
             <pointer>
                 <enum base-type='int16_t' name='type'>
                     <enum-item name='Item'/>