diff --git a/quests/mak/MainFloor b/quests/mak/MainFloor
index 344ab6599..b5a1de9d6 100644
--- a/quests/mak/MainFloor
+++ b/quests/mak/MainFloor
@@ -635,10 +635,6 @@ arch dungeon_magic
 x 2
 y 11
 end
-arch marble
-x 2
-y 11
-end
 arch magic_mouth
 msg
 Pull the lever to start the trial
@@ -647,6 +643,10 @@ endmsg
 x 2
 y 11
 end
+arch marble
+x 2
+y 11
+end
 arch teleporter
 slaying dragons/elec
 hp 15
@@ -5783,10 +5783,6 @@ connected 107
 x 12
 y 3
 end
-arch marble
-x 12
-y 3
-end
 arch magic_mouth
 msg
 Drop the ancient bracers.
@@ -5794,6 +5790,10 @@ endmsg
 x 12
 y 3
 end
+arch marble
+x 12
+y 3
+end
 arch altar
 slaying ancient bracers
 food 1
@@ -6235,10 +6235,6 @@ connected 106
 x 13
 y 3
 end
-arch marble
-x 13
-y 3
-end
 arch magic_mouth
 msg
 Drop the soft shoes here.
@@ -6246,6 +6242,10 @@ endmsg
 x 13
 y 3
 end
+arch marble
+x 13
+y 3
+end
 arch altar
 slaying soft shoes
 food 1
@@ -6746,10 +6746,6 @@ connected 105
 x 14
 y 3
 end
-arch marble
-x 14
-y 3
-end
 arch magic_mouth
 msg
 Drop the silk gloves here.
@@ -6757,6 +6753,10 @@ endmsg
 x 14
 y 3
 end
+arch marble
+x 14
+y 3
+end
 arch altar
 slaying silk gloves
 food 1
@@ -7210,10 +7210,6 @@ connected 104
 x 15
 y 3
 end
-arch marble
-x 15
-y 3
-end
 arch magic_mouth
 msg
 Drop the bearskin belt here.
@@ -7221,6 +7217,10 @@ endmsg
 x 15
 y 3
 end
+arch marble
+x 15
+y 3
+end
 arch altar
 slaying bearskin belt
 food 1
@@ -7707,10 +7707,6 @@ connected 103
 x 16
 y 3
 end
-arch marble
-x 16
-y 3
-end
 arch magic_mouth
 msg
 Drop the banded mail here.
@@ -7718,6 +7714,10 @@ endmsg
 x 16
 y 3
 end
+arch marble
+x 16
+y 3
+end
 arch altar
 slaying banded mail
 food 1
@@ -8159,10 +8159,6 @@ connected 102
 x 17
 y 3
 end
-arch marble
-x 17
-y 3
-end
 arch magic_mouth
 msg
 Drop the sharp axe here.
@@ -8170,6 +8166,10 @@ endmsg
 x 17
 y 3
 end
+arch marble
+x 17
+y 3
+end
 arch altar
 slaying sharp axe
 food 1
@@ -8670,10 +8670,6 @@ connected 101
 x 18
 y 3
 end
-arch marble
-x 18
-y 3
-end
 arch magic_mouth
 msg
 Drop the strongman diploma here.
@@ -8681,6 +8677,10 @@ endmsg
 x 18
 y 3
 end
+arch marble
+x 18
+y 3
+end
 arch altar
 slaying strongman diploma
 food 1
@@ -13120,10 +13120,6 @@ arch dungeon_magic
 x 27
 y 40
 end
-arch marble
-x 27
-y 40
-end
 arch magic_mouth
 msg
 The watcher says:
@@ -13139,6 +13135,10 @@ y 40
 end
 arch marble
 x 27
+y 40
+end
+arch marble
+x 27
 y 41
 end
 arch cwall_2_1_2
diff --git a/quests/mak/chaos/down1 b/quests/mak/chaos/down1
index 5b7413e62..c3875ac54 100644
--- a/quests/mak/chaos/down1
+++ b/quests/mak/chaos/down1
@@ -2191,10 +2191,6 @@ arch dungeon_floor
 x 11
 y 21
 end
-arch dungeon_floor
-x 11
-y 22
-end
 arch magic_mouth
 msg
 These kobolds seem to have gone insane
@@ -2205,6 +2201,10 @@ y 22
 end
 arch dungeon_floor
 x 11
+y 22
+end
+arch dungeon_floor
+x 11
 y 23
 end
 arch dungeon_floor
diff --git a/quests/mak/chaos/fallen b/quests/mak/chaos/fallen
index 93c77be23..9a41ca774 100644
--- a/quests/mak/chaos/fallen
+++ b/quests/mak/chaos/fallen
@@ -712,10 +712,6 @@ arch mine2
 x 3
 y 30
 end
-arch flagstone
-x 3
-y 31
-end
 arch magic_mouth
 msg
 You have a really bad feeling about
@@ -724,6 +720,10 @@ endmsg
 x 3
 y 31
 end
+arch flagstone
+x 3
+y 31
+end
 arch button_lever
 x 3
 y 31
@@ -5707,10 +5707,6 @@ arch mine2
 x 28
 y 30
 end
-arch flagstone
-x 28
-y 31
-end
 arch magic_mouth
 msg
 You have a really bad feeling about
@@ -5719,6 +5715,10 @@ endmsg
 x 28
 y 31
 end
+arch flagstone
+x 28
+y 31
+end
 arch button_lever
 x 28
 y 31
diff --git a/quests/mak/dragons/chaos b/quests/mak/dragons/chaos
index 22d54774d..6b8cc083c 100644
--- a/quests/mak/dragons/chaos
+++ b/quests/mak/dragons/chaos
@@ -271,10 +271,6 @@ arch dungeon_floor
 x 1
 y 12
 end
-arch dungeon_floor
-x 1
-y 13
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -282,6 +278,10 @@ endmsg
 x 1
 y 13
 end
+arch dungeon_floor
+x 1
+y 13
+end
 arch button_lever
 x 1
 y 13
@@ -395,10 +395,6 @@ arch dungeon_floor
 x 2
 y 1
 end
-arch dungeon_floor
-x 2
-y 2
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -406,6 +402,10 @@ endmsg
 x 2
 y 2
 end
+arch dungeon_floor
+x 2
+y 2
+end
 arch button_lever
 x 2
 y 2
@@ -619,10 +619,6 @@ x 2
 y 23
 connected 3
 end
-arch dungeon_floor
-x 2
-y 24
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -630,6 +626,10 @@ endmsg
 x 2
 y 24
 end
+arch dungeon_floor
+x 2
+y 24
+end
 arch button_lever
 x 2
 y 24
@@ -2654,10 +2654,6 @@ end
 arch cave4
 x 14
 end
-arch dungeon_floor
-x 14
-y 1
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -2665,6 +2661,10 @@ endmsg
 x 14
 y 1
 end
+arch dungeon_floor
+x 14
+y 1
+end
 arch button_lever
 x 14
 y 1
@@ -2960,10 +2960,6 @@ x 15
 y 24
 connected 96
 end
-arch dungeon_floor
-x 15
-y 25
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -2971,6 +2967,10 @@ endmsg
 x 15
 y 25
 end
+arch dungeon_floor
+x 15
+y 25
+end
 arch button_lever
 x 15
 y 25
@@ -5373,10 +5373,6 @@ arch dungeon_floor
 x 28
 y 1
 end
-arch dungeon_floor
-x 28
-y 2
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -5384,6 +5380,10 @@ endmsg
 x 28
 y 2
 end
+arch dungeon_floor
+x 28
+y 2
+end
 arch button_lever
 x 28
 y 2
@@ -5597,10 +5597,6 @@ x 28
 y 23
 connected 3
 end
-arch dungeon_floor
-x 28
-y 24
-end
 arch magic_mouth
 msg
 Wonder which lever might be best to pull
@@ -5608,6 +5604,10 @@ endmsg
 x 28
 y 24
 end
+arch dungeon_floor
+x 28
+y 24
+end
 arch button_lever
 x 28
 y 24
diff --git a/quests/mak/dragons/elec b/quests/mak/dragons/elec
index 4886dcfd4..05bef13e5 100644
--- a/quests/mak/dragons/elec
+++ b/quests/mak/dragons/elec
@@ -2659,10 +2659,6 @@ arch pstone_1
 x 15
 y 12
 end
-arch pstone_1
-x 15
-y 13
-end
 arch magic_mouth
 msg
 Pull the lever to start the trial
@@ -2671,6 +2667,10 @@ endmsg
 x 15
 y 13
 end
+arch pstone_1
+x 15
+y 13
+end
 arch magic_ear
 msg
 @match help
diff --git a/quests/mak/giant/mainfloor b/quests/mak/giant/mainfloor
index 7a522afd5..fc4ce8857 100644
--- a/quests/mak/giant/mainfloor
+++ b/quests/mak/giant/mainfloor
@@ -1582,10 +1582,6 @@ arch cobblestones
 x 10
 y 20
 end
-arch cobblestones
-x 10
-y 21
-end
 arch magic_mouth
 msg
 You can here loud snoring coming from
@@ -1596,6 +1592,10 @@ y 21
 end
 arch cobblestones
 x 10
+y 21
+end
+arch cobblestones
+x 10
 y 22
 end
 arch cobblestones
diff --git a/quests/mak/mansion/floor2 b/quests/mak/mansion/floor2
index b8722d442..e49007f8e 100644
--- a/quests/mak/mansion/floor2
+++ b/quests/mak/mansion/floor2
@@ -3299,10 +3299,6 @@ arch chair_2.1
 x 27
 y 10
 end
-arch woodfloor
-x 27
-y 11
-end
 arch magic_mouth
 msg
 You see a loose board in the southern wall
@@ -3310,6 +3306,10 @@ endmsg
 x 27
 y 11
 end
+arch woodfloor
+x 27
+y 11
+end
 arch spider_web
 x 27
 y 11
@@ -4023,10 +4023,6 @@ arch wwall_2_1_2
 x 33
 y 12
 end
-arch woodfloor
-x 33
-y 13
-end
 arch magic_mouth
 msg
 <You hear some noise from under
@@ -4039,6 +4035,10 @@ connected 95
 walk_on 0
 fly_on 0
 end
+arch woodfloor
+x 33
+y 13
+end
 arch button_lever
 msg
 endmsg
diff --git a/quests/mak/troll_cave/cave.1 b/quests/mak/troll_cave/cave.1
index d2bd2b8ea..c1adf7837 100644
--- a/quests/mak/troll_cave/cave.1
+++ b/quests/mak/troll_cave/cave.1
@@ -109,10 +109,6 @@ arch small_stones
 x 2
 y 3
 end
-arch small_stones
-x 2
-y 4
-end
 arch magic_mouth
 msg
 This tunnel seems to have been blocked
@@ -123,6 +119,10 @@ y 4
 end
 arch small_stones
 x 2
+y 4
+end
+arch small_stones
+x 2
 y 5
 end
 arch boulder
@@ -518,10 +518,6 @@ arch cave5
 x 12
 y 3
 end
-arch small_stones
-x 12
-y 4
-end
 arch invis_exit
 slaying cave.2
 hp 2
@@ -531,6 +527,10 @@ y 4
 end
 arch small_stones
 x 12
+y 4
+end
+arch small_stones
+x 12
 y 5
 end
 arch cave2
diff --git a/quests/mak/troll_cave/cave.2 b/quests/mak/troll_cave/cave.2
index f05d532f5..99d0bd727 100644
--- a/quests/mak/troll_cave/cave.2
+++ b/quests/mak/troll_cave/cave.2
@@ -107,10 +107,6 @@ arch cave5
 x 1
 y 2
 end
-arch small_stones
-x 1
-y 3
-end
 arch invis_exit
 slaying cave.1
 hp 11
@@ -120,6 +116,10 @@ y 3
 end
 arch small_stones
 x 1
+y 3
+end
+arch small_stones
+x 1
 y 4
 end
 arch cave7
@@ -847,10 +847,6 @@ arch cave8
 x 6
 y 18
 end
-arch small_stones
-x 6
-y 19
-end
 arch invis_exit
 slaying cave.3
 hp 17
@@ -860,6 +856,10 @@ y 19
 end
 arch small_stones
 x 6
+y 19
+end
+arch small_stones
+x 6
 y 20
 end
 arch cave2
diff --git a/quests/mak/troll_cave/cave.3 b/quests/mak/troll_cave/cave.3
index 3e19a067c..cb1a1944c 100644
--- a/quests/mak/troll_cave/cave.3
+++ b/quests/mak/troll_cave/cave.3
@@ -1662,10 +1662,6 @@ arch cave8
 x 18
 y 11
 end
-arch small_stones
-x 18
-y 12
-end
 arch invis_exit
 slaying cave.2
 hp 7
@@ -1675,6 +1671,10 @@ y 12
 end
 arch small_stones
 x 18
+y 12
+end
+arch small_stones
+x 18
 y 13
 end
 arch cave6
diff --git a/quests/mak/undead/catacombs b/quests/mak/undead/catacombs
index 8205983c4..4bc805b15 100644
--- a/quests/mak/undead/catacombs
+++ b/quests/mak/undead/catacombs
@@ -1234,10 +1234,6 @@ x 6
 y 4
 no_pass 1
 end
-arch dungeon_floor
-x 6
-y 5
-end
 arch magic_mouth
 msg
 These simple gravestones don't mark
@@ -1248,6 +1244,10 @@ y 5
 end
 arch dungeon_floor
 x 6
+y 5
+end
+arch dungeon_floor
+x 6
 y 6
 end
 arch awall_1_3
@@ -1997,10 +1997,6 @@ arch dungeon_floor
 x 10
 y 6
 end
-arch dungeon_floor
-x 10
-y 7
-end
 arch magic_mouth
 msg
 People getting their own rooms must
@@ -2011,6 +2007,10 @@ y 7
 end
 arch dungeon_floor
 x 10
+y 7
+end
+arch dungeon_floor
+x 10
 y 8
 end
 arch door_look_1
@@ -2076,10 +2076,6 @@ arch dungeon_floor
 x 10
 y 19
 end
-arch dungeon_floor
-x 10
-y 20
-end
 arch magic_mouth
 msg
 There seems to be some really
@@ -2090,6 +2086,10 @@ y 20
 end
 arch dungeon_floor
 x 10
+y 20
+end
+arch dungeon_floor
+x 10
 y 21
 end
 arch dungeon_floor
@@ -2752,10 +2752,6 @@ x 14
 y 4
 no_pass 1
 end
-arch dungeon_floor
-x 14
-y 5
-end
 arch magic_mouth
 msg
 These simple gravestones don't mark
@@ -2766,6 +2762,10 @@ y 5
 end
 arch dungeon_floor
 x 14
+y 5
+end
+arch dungeon_floor
+x 14
 y 6
 end
 arch awall_1_4
diff --git a/quests/mak/undead/graveyard b/quests/mak/undead/graveyard
index 178f53a67..052b83864 100644
--- a/quests/mak/undead/graveyard
+++ b/quests/mak/undead/graveyard
@@ -893,10 +893,6 @@ arch grass
 x 8
 y 15
 end
-arch brush
-x 8
-y 16
-end
 arch invis_exit
 slaying ../MainFloor
 hp 25
@@ -904,6 +900,10 @@ sp 27
 x 8
 y 16
 end
+arch brush
+x 8
+y 16
+end
 arch ggate_open
 x 8
 y 16