diff --git a/df.advmode.xml b/df.advmode.xml
index e1cfaae9b..06714ddf1 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -322,6 +322,9 @@
+
+ not sure where this is, just that it's before bogeymen_timer
+
@@ -510,6 +513,23 @@
+
+
+ ?
+
+
+
+ ?
+ ?
+ ?
+ ?
+
+ ?
+ ?
+ ?
+ ?
+
+
+
+
+
diff --git a/df.history.xml b/df.history.xml
index 79509e1f5..69b1c3c16 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -1673,7 +1673,7 @@
-
+
@@ -1687,14 +1687,20 @@
+
-
+
+
+
+
+
+
diff --git a/df.materials.xml b/df.materials.xml
index 6a7c10e89..264afc935 100644
--- a/df.materials.xml
+++ b/df.materials.xml
@@ -481,13 +481,13 @@
-
+
-
+
-
diff --git a/df.raws.xml b/df.raws.xml
index 1773017d5..0b8ff8be5 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -79,7 +79,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
-- Descriptors
@@ -128,6 +128,7 @@
+
diff --git a/df.stockpile.xml b/df.stockpile.xml
index 39fb5355f..e344fde2c 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -298,6 +298,9 @@
+
+
+
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index 16308f5a8..c99cea213 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -225,6 +225,8 @@
+
+
@@ -248,6 +250,7 @@
+
@@ -276,6 +279,8 @@
judging from the destructor, these two sections should probably be in different compounds
+
+
@@ -288,6 +293,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -306,6 +323,8 @@
+
+
-- Abstract representation of contents; updated by need_scan
diff --git a/df.ui.xml b/df.ui.xml
index d2f7f1a01..d7476abef 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -329,6 +329,12 @@
+
+
+
+
+
+
@@ -514,6 +520,8 @@
+
+
@@ -552,6 +560,8 @@
+
+
diff --git a/df.units.xml b/df.units.xml
index e3512812b..ee9b34d91 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -482,6 +482,7 @@
+
@@ -767,6 +768,7 @@
+
@@ -965,6 +967,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// age ? incremented every tick
diff --git a/df.world.xml b/df.world.xml
index dd99b21c5..4bbfae361 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -451,7 +451,7 @@
-
+
@@ -498,7 +498,7 @@
-
+
@@ -750,6 +750,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -793,10 +823,10 @@
comment='Appears to be precomputed rounded integer distances'/>
-
+
-
+
@@ -891,11 +921,12 @@
+
+
+
+
-
-
-
-- RAWs
@@ -1075,6 +1106,7 @@
+
@@ -1155,6 +1187,7 @@
+
diff --git a/symbols.xml b/symbols.xml
index 5bba759c7..87568b566 100644
--- a/symbols.xml
+++ b/symbols.xml
@@ -127,88 +127,90 @@
.data
-
-
+
+
-
-
+
+
-
-
+
+
.bss compound - THAT IS, NOT SIMPLE INTEGER VARIABLES!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
generated cglobals
generated keydisplay
- .bss primitive
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ .bss primitive
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
code