diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index 2b4bdbcd7..b780ff75f 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -1091,6 +1091,7 @@ linedeftypes
 		{
 			title = "Water, Opaque";
 			prefix = "(120)";
+			flags2text = "[1] Make lava intangible";
 			flags8text = "[3] Slope skew sides";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
@@ -1106,6 +1107,7 @@ linedeftypes
 		{
 			title = "Water, Translucent";
 			prefix = "(121)";
+			flags2text = "[1] Make lava intangible";
 			flags8text = "[3] Slope skew sides";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
@@ -1122,6 +1124,7 @@ linedeftypes
 		{
 			title = "Water, Opaque, No Sides";
 			prefix = "(122)";
+			flags2text = "[1] Make lava intangible";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
 			flags1024text = "[10] Ripple effect";
@@ -1136,6 +1139,7 @@ linedeftypes
 		{
 			title = "Water, Translucent, No Sides";
 			prefix = "(123)";
+			flags2text = "[1] Make lava intangible";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
 			flags1024text = "[10] Ripple effect";
@@ -1151,6 +1155,7 @@ linedeftypes
 		{
 			title = "Goo Water, Translucent";
 			prefix = "(124)";
+			flags2text = "[1] Make lava intangible";
 			flags8text = "[3] Slope skew sides";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
@@ -1167,6 +1172,7 @@ linedeftypes
 		{
 			title = "Goo Water, Translucent, No Sides";
 			prefix = "(125)";
+			flags2text = "[1] Make lava intangible";
 			flags64text = "[6] Use two light levels";
 			flags512text = "[9] Use target light level";
 			flags1024text = "[10] Ripple effect";
@@ -1669,12 +1675,14 @@ linedeftypes
 		{
 			title = "Continuous";
 			prefix = "(300)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		301
 		{
 			title = "Each Time";
 			prefix = "(301)";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Also trigger on exit";
 		}
 
@@ -1682,6 +1690,7 @@ linedeftypes
 		{
 			title = "Once";
 			prefix = "(302)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		303
@@ -1691,6 +1700,7 @@ linedeftypes
 			flags2text = "[1] Rings greater or equal";
 			flags64text = "[6] Rings less or equal";
 			flags512text = "[9] Consider all players";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		304
@@ -1700,18 +1710,21 @@ linedeftypes
 			flags2text = "[1] Rings greater or equal";
 			flags64text = "[6] Rings less or equal";
 			flags512text = "[9] Consider all players";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		305
 		{
 			title = "Character Ability - Continuous";
 			prefix = "(305)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		306
 		{
 			title = "Character Ability - Each Time";
 			prefix = "(306)";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Also trigger on exit";
 		}
 
@@ -1719,24 +1732,28 @@ linedeftypes
 		{
 			title = "Character Ability - Once";
 			prefix = "(307)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		308
 		{
 			title = "Race Only - Once";
 			prefix = "(308)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		309
 		{
 			title = "CTF Red Team - Continuous";
 			prefix = "(309)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		310
 		{
 			title = "CTF Red Team - Each Time";
 			prefix = "(310)";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Also trigger on exit";
 		}
 
@@ -1744,12 +1761,14 @@ linedeftypes
 		{
 			title = "CTF Blue Team - Continuous";
 			prefix = "(311)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		312
 		{
 			title = "CTF Blue Team - Each Time";
 			prefix = "(312)";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Also trigger on exit";
 		}
 
@@ -1757,6 +1776,7 @@ linedeftypes
 		{
 			title = "No More Enemies - Once";
 			prefix = "(313)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		314
@@ -1765,6 +1785,7 @@ linedeftypes
 			prefix = "(314)";
 			flags64text = "[6] Number greater or equal";
 			flags512text = "[9] Number less";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		315
@@ -1773,30 +1794,35 @@ linedeftypes
 			prefix = "(315)";
 			flags64text = "[6] Number greater or equal";
 			flags512text = "[9] Number less";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		317
 		{
 			title = "Condition Set Trigger - Continuous";
 			prefix = "(317)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		318
 		{
 			title = "Condition Set Trigger - Once";
 			prefix = "(318)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		319
 		{
 			title = "Unlockable - Continuous";
 			prefix = "(319)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		320
 		{
 			title = "Unlockable - Once";
 			prefix = "(320)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		321
@@ -1804,6 +1830,7 @@ linedeftypes
 			title = "Trigger After X Calls - Continuous";
 			prefix = "(321)";
 			flags64text = "[6] Trigger more than once";
+			flags1024text = "[10] Use faster, unordered execution";
 
 		}
 
@@ -1812,6 +1839,7 @@ linedeftypes
 			title = "Trigger After X Calls - Each Time";
 			prefix = "(322)";
 			flags64text = "[6] Trigger more than once";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		323
@@ -1826,6 +1854,7 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Run if no more mares";
 			flags32768text = "[15] Run if player is not NiGHTS";
 		}
@@ -1833,6 +1862,7 @@ linedeftypes
 		324
 		{
 			title = "NiGHTSerize - Once";
+			prefix = "(324)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags8text = "[3] Run only if player is NiGHTS";
 			flags16text = "[4] Count from lowest of players";
@@ -1841,14 +1871,15 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Run if no more mares";
 			flags32768text = "[15] Run if player is not NiGHTS";
-			prefix = "(324)";
 		}
 
 		325
 		{
 			title = "De-NiGHTSerize - Each Time";
+			prefix = "(325)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags8text = "[3] Run if anyone is NiGHTS";
 			flags16text = "[4] Count from lowest of players";
@@ -1857,13 +1888,14 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags32768text = "[15] Run if no one is NiGHTS";
-			prefix = "(325)";
 		}
 
 		326
 		{
 			title = "De-NiGHTSerize - Once";
+			prefix = "(326)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags8text = "[3] Run if anyone is NiGHTS";
 			flags16text = "[4] Count from lowest of players";
@@ -1872,13 +1904,14 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags32768text = "[15] Run if no one is NiGHTS";
-			prefix = "(326)";
 		}
 
 		327
 		{
 			title = "NiGHTS Lap - Each Time";
+			prefix = "(327)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags16text = "[4] Count from lowest of players";
 			flags32text = "[5] Lap <= Front Y Offset";
@@ -1886,12 +1919,13 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
-			prefix = "(327)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		328
 		{
 			title = "NiGHTS Lap - Once";
+			prefix = "(328)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags16text = "[4] Count from lowest of players";
 			flags32text = "[5] Lap <= Front Y Offset";
@@ -1899,12 +1933,13 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
-			prefix = "(328)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		329
 		{
 			title = "Ideya Capture Touch - Each Time";
+			prefix = "(329)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags8text = "[3] Run regardless of spheres";
 			flags16text = "[4] Count from lowest of players";
@@ -1913,14 +1948,15 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Only if not enough spheres";
 			flags32768text = "[15] Run when entering Capture";
-			prefix = "(329)";
 		}
 
 		330
 		{
 			title = "Ideya Capture Touch - Once";
+			prefix = "(330)";
 			flags2text = "[1] Mare >= Front X Offset";
 			flags8text = "[3] Run regardless of spheres";
 			flags16text = "[4] Count from lowest of players";
@@ -1929,57 +1965,64 @@ linedeftypes
 			flags128text = "[7] Lap >= Front Y Offset";
 			flags256text = "[8] Count laps from Bonus Time";
 			flags512text = "[9] Count from triggering player";
+			flags1024text = "[10] Use faster, unordered execution";
 			flags16384text = "[14] Only if not enough spheres";
 			flags32768text = "[15] Run when entering Capture";
-			prefix = "(330)";
 		}
 
 		331
 		{
 			title = "Player Skin - Continuous";
-			flags64text = "[6] Disable for this skin";
 			prefix = "(331)";
+			flags64text = "[6] Disable for this skin";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		332
 		{
 			title = "Player Skin - Each Time";
-			flags64text = "[6] Disable for this skin";
 			prefix = "(332)";
+			flags64text = "[6] Disable for this skin";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		333
 		{
 			title = "Player Skin - Once";
-			flags64text = "[6] Disable for this skin";
 			prefix = "(333)";
+			flags64text = "[6] Disable for this skin";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		334
 		{
 			title = "Object Dye - Continuous";
-			flags64text = "[6] Disable for this color";
 			prefix = "(334)";
+			flags64text = "[6] Disable for this color";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		335
 		{
 			title = "Object Dye - Each Time";
-			flags64text = "[6] Disable for this color";
 			prefix = "(335)";
+			flags64text = "[6] Disable for this color";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		336
 		{
 			title = "Object Dye - Once";
-			flags64text = "[6] Disable for this color";
 			prefix = "(336)";
+			flags64text = "[6] Disable for this color";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 
 		399
 		{
 			title = "Level Load";
 			prefix = "(399)";
+			flags1024text = "[10] Use faster, unordered execution";
 		}
 	}
 
@@ -2662,7 +2705,7 @@ linedeftypes
 
 		502
 		{
-			title = "Scroll Tagged Wall";
+			title = "Scroll Tagged Walls";
 			prefix = "(502)";
 			flags128text = "[7] Use texture offsets";
 			flags256text = "[8] Scroll back side";
@@ -2670,7 +2713,7 @@ linedeftypes
 
 		503
 		{
-			title = "Scroll Tagged Wall (Accelerative)";
+			title = "Scroll Tagged Walls (Accelerative)";
 			prefix = "(503)";
 			flags128text = "[7] Use texture offsets";
 			flags256text = "[8] Scroll back side";
@@ -2678,7 +2721,7 @@ linedeftypes
 
 		504
 		{
-			title = "Scroll Tagged Wall (Displacement)";
+			title = "Scroll Tagged Walls (Displacement)";
 			prefix = "(504)";
 			flags128text = "[7] Use texture offsets";
 			flags256text = "[8] Scroll back side";
@@ -3112,7 +3155,7 @@ linedeftypes
 		723
 		{
 			title = "Copy Backside Floor Slope from Line Tag";
-			prefix = "(720)";
+			prefix = "(723)";
 			slope = "copy";
 			slopeargs = 4;
 		}
@@ -3120,7 +3163,7 @@ linedeftypes
 		724
 		{
 			title = "Copy Backside Ceiling Slope from Line Tag";
-			prefix = "(721)";
+			prefix = "(724)";
 			slope = "copy";
 			slopeargs = 8;
 		}
@@ -3128,7 +3171,7 @@ linedeftypes
 		725
 		{
 			title = "Copy Backside Floor and Ceiling Slope from Line Tag";
-			prefix = "(722)";
+			prefix = "(725)";
 			slope = "copy";
 			slopeargs = 12;
 		}
@@ -3190,7 +3233,7 @@ linedeftypes
 
 	transwall
 	{
-		title = "Translucent Wall";
+		title = "Translucent Walls";
 
 		900
 		{
@@ -3966,6 +4009,7 @@ thingtypes
 			sprite = "BUMBA1";
 			width = 16;
 			height = 32;
+			flags8text = "[8] Cannot move";
 		}
 		124
 		{
@@ -3996,7 +4040,6 @@ thingtypes
 			width = 24;
 			height = 76;
 			flags4text = "[4] End level on death";
-			flags8text = "[8] Alternate laser attack";
 		}
 		201
 		{
@@ -4031,6 +4074,7 @@ thingtypes
 			height = 60;
 			flags1text = "[1] Grayscale mode";
 			flags4text = "[4] End level on death";
+			flags8text = "[8] Skip intro";
 		}
 		206
 		{
@@ -5232,7 +5276,7 @@ thingtypes
 			width = 8;
 			height = 16;
 			hangs = 1;
-			angletext = "Dripping interval";
+			angletext = "Dripping delay";
 			fixedrotation = 1;
 		}
 		1003
@@ -5574,6 +5618,8 @@ thingtypes
 			width = 20;
 			height = 72;
 			arrow = 1;
+			flags4text = "[4] Move right";
+			flags8text = "[8] Move left";
 		}
 		1128
 		{
@@ -5726,6 +5772,7 @@ thingtypes
 			width = 24;
 			height = 63;
 			arrow = 1;
+			flags8text = "[8] Not pushable";
 		}
 		1217
 		{
@@ -5861,6 +5908,7 @@ thingtypes
 			height = 32;
 			angletext = "Initial delay";
 			fixedrotation = 1;
+			hangs = 1;
 			flags8text = "[8] Double size";
 		}
 		1305