diff --git a/dungeons/monkey_temple/m_temple1 b/dungeons/monkey_temple/m_temple1
index b0b6a56f3..192372440 100644
--- a/dungeons/monkey_temple/m_temple1
+++ b/dungeons/monkey_temple/m_temple1
@@ -44,9 +44,6 @@ end
 arch brush
 y 10
 end
-arch brush
-y 11
-end
 arch invis_exit
 slaying /world/world_115_117
 hp 40
@@ -54,12 +51,15 @@ sp 14
 y 11
 end
 arch brush
+y 11
+end
+arch invis_exit
+slaying /world/world_115_117
+hp 40
+sp 14
 y 12
 end
-arch invis_exit
-slaying /world/world_115_117
-hp 40
-sp 14
+arch brush
 y 12
 end
 arch brush
@@ -2969,10 +2969,6 @@ arch deep_swamp
 x 19
 y 13
 end
-arch flagstone
-x 19
-y 14
-end
 arch magic_mouth
 msg
 This wall looks like it might be on some sort of rail...
@@ -2984,6 +2980,10 @@ y 14
 end
 arch flagstone
 x 19
+y 14
+end
+arch flagstone
+x 19
 y 15
 end
 arch bwall_2_1_2
@@ -3471,10 +3471,6 @@ arch flagstone
 x 22
 y 10
 end
-arch flagstone
-x 22
-y 11
-end
 arch magic_mouth
 msg
 The base of the wall is suspiciously clean from swamp grime.
@@ -3486,6 +3482,10 @@ y 11
 end
 arch flagstone
 x 22
+y 11
+end
+arch flagstone
+x 22
 y 12
 end
 arch block_door_closed
diff --git a/dungeons/monkey_temple/m_temple2 b/dungeons/monkey_temple/m_temple2
index b694967df..12ef920cf 100644
--- a/dungeons/monkey_temple/m_temple2
+++ b/dungeons/monkey_temple/m_temple2
@@ -902,10 +902,6 @@ arch flagstone
 x 6
 y 7
 end
-arch flagstone
-x 6
-y 8
-end
 arch magic_mouth
 msg
 Oooooook...
@@ -921,6 +917,10 @@ y 8
 end
 arch flagstone
 x 6
+y 8
+end
+arch flagstone
+x 6
 y 9
 end
 arch flagstone
diff --git a/dungeons/train/train-old b/dungeons/train/train-old
index d1c45091c..38f12741e 100644
--- a/dungeons/train/train-old
+++ b/dungeons/train/train-old
@@ -526,10 +526,6 @@ face wyvern.231
 x 3
 y 3
 end
-arch flagstone
-x 3
-y 4
-end
 arch magic_mouth
 msg
 Offer a dragon scale to face powerful dragons
@@ -537,6 +533,10 @@ endmsg
 x 3
 y 4
 end
+arch flagstone
+x 3
+y 4
+end
 arch altar
 msg
 Beware!
@@ -574,10 +574,6 @@ face smalltroll.112
 x 3
 y 7
 end
-arch flagstone
-x 3
-y 8
-end
 arch magic_mouth
 msg
 Offer a bonecrusher to face powerful humanoids
@@ -585,6 +581,10 @@ endmsg
 x 3
 y 8
 end
+arch flagstone
+x 3
+y 8
+end
 arch altar
 msg
 Beware!
@@ -881,10 +881,6 @@ face fiend.112
 x 6
 y 3
 end
-arch flagstone
-x 6
-y 4
-end
 arch magic_mouth
 msg
 Offer a Firebrand to face powerful demons
@@ -892,6 +888,10 @@ endmsg
 x 6
 y 4
 end
+arch flagstone
+x 6
+y 4
+end
 arch altar
 msg
 Prepare for fire and brimstone...
@@ -929,10 +929,6 @@ face grimreaper.111
 x 6
 y 7
 end
-arch flagstone
-x 6
-y 8
-end
 arch magic_mouth
 msg
 Offer a lich dust to face powerful undead
@@ -940,6 +936,10 @@ endmsg
 x 6
 y 8
 end
+arch flagstone
+x 6
+y 8
+end
 arch altar
 msg
 Beware!
diff --git a/dungeons/trollbridge b/dungeons/trollbridge
index 89bf38a70..6dcb3f911 100644
--- a/dungeons/trollbridge
+++ b/dungeons/trollbridge
@@ -19,9 +19,6 @@ end
 arch dwall_win2
 y 1
 end
-arch woodfloor
-y 2
-end
 arch invis_exit
 slaying /world/world_105_115
 hp 19
@@ -29,7 +26,7 @@ sp 8
 y 2
 end
 arch woodfloor
-y 3
+y 2
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -38,7 +35,7 @@ sp 8
 y 3
 end
 arch woodfloor
-y 4
+y 3
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -47,7 +44,7 @@ sp 8
 y 4
 end
 arch woodfloor
-y 5
+y 4
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -56,7 +53,7 @@ sp 8
 y 5
 end
 arch woodfloor
-y 6
+y 5
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -65,12 +62,15 @@ sp 8
 y 6
 end
 arch woodfloor
+y 6
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 19
+sp 8
 y 7
 end
-arch invis_exit
-slaying /world/world_105_115
-hp 19
-sp 8
+arch woodfloor
 y 7
 end
 arch woodfloor
@@ -485,10 +485,6 @@ arch dwall_win2
 x 6
 y 1
 end
-arch woodfloor
-x 6
-y 2
-end
 arch button_small
 invisible 1
 connected 1
@@ -497,7 +493,7 @@ y 2
 end
 arch woodfloor
 x 6
-y 3
+y 2
 end
 arch button_small
 invisible 1
@@ -507,7 +503,7 @@ y 3
 end
 arch woodfloor
 x 6
-y 4
+y 3
 end
 arch button_small
 invisible 1
@@ -517,7 +513,7 @@ y 4
 end
 arch woodfloor
 x 6
-y 5
+y 4
 end
 arch button_small
 invisible 1
@@ -527,7 +523,7 @@ y 5
 end
 arch woodfloor
 x 6
-y 6
+y 5
 end
 arch button_small
 invisible 1
@@ -537,11 +533,15 @@ y 6
 end
 arch woodfloor
 x 6
+y 6
+end
+arch button_small
+invisible 1
+connected 1
+x 6
 y 7
 end
-arch button_small
-invisible 1
-connected 1
+arch woodfloor
 x 6
 y 7
 end
@@ -1124,10 +1124,6 @@ arch woodfloor
 x 14
 y 6
 end
-arch woodfloor
-x 14
-y 7
-end
 arch button_small
 invisible 1
 connected 3
@@ -1136,6 +1132,10 @@ y 7
 end
 arch woodfloor
 x 14
+y 7
+end
+arch woodfloor
+x 14
 y 8
 end
 arch dwall_win2
@@ -1592,10 +1592,6 @@ arch dwall_win2
 x 22
 y 1
 end
-arch woodfloor
-x 22
-y 2
-end
 arch button_small
 invisible 1
 connected 1
@@ -1604,7 +1600,7 @@ y 2
 end
 arch woodfloor
 x 22
-y 3
+y 2
 end
 arch button_small
 invisible 1
@@ -1614,7 +1610,7 @@ y 3
 end
 arch woodfloor
 x 22
-y 4
+y 3
 end
 arch button_small
 invisible 1
@@ -1624,7 +1620,7 @@ y 4
 end
 arch woodfloor
 x 22
-y 5
+y 4
 end
 arch button_small
 invisible 1
@@ -1634,7 +1630,7 @@ y 5
 end
 arch woodfloor
 x 22
-y 6
+y 5
 end
 arch button_small
 invisible 1
@@ -1644,11 +1640,15 @@ y 6
 end
 arch woodfloor
 x 22
+y 6
+end
+arch button_small
+invisible 1
+connected 1
+x 22
 y 7
 end
-arch button_small
-invisible 1
-connected 1
+arch woodfloor
 x 22
 y 7
 end
@@ -2026,10 +2026,6 @@ arch dwall_win2
 x 29
 y 1
 end
-arch woodfloor
-x 29
-y 2
-end
 arch invis_exit
 slaying /world/world_105_115
 hp 23
@@ -2039,7 +2035,7 @@ y 2
 end
 arch woodfloor
 x 29
-y 3
+y 2
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -2050,7 +2046,7 @@ y 3
 end
 arch woodfloor
 x 29
-y 4
+y 3
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -2061,7 +2057,7 @@ y 4
 end
 arch woodfloor
 x 29
-y 5
+y 4
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -2072,7 +2068,7 @@ y 5
 end
 arch woodfloor
 x 29
-y 6
+y 5
 end
 arch invis_exit
 slaying /world/world_105_115
@@ -2083,12 +2079,16 @@ y 6
 end
 arch woodfloor
 x 29
+y 6
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 23
+sp 8
+x 29
 y 7
 end
-arch invis_exit
-slaying /world/world_105_115
-hp 23
-sp 8
+arch woodfloor
 x 29
 y 7
 end