diff --git a/quests/todd/aljwaf/crypt b/quests/todd/aljwaf/crypt
index 26224f1e8..bd968dcb2 100644
--- a/quests/todd/aljwaf/crypt
+++ b/quests/todd/aljwaf/crypt
@@ -639,10 +639,6 @@ arch generate_scorpion
 x 5
 y 10
 end
-arch marble
-x 5
-y 11
-end
 arch magic_mouth
 msg
 You hear a strange echo.
@@ -652,6 +648,10 @@ food 1
 x 5
 y 11
 end
+arch marble
+x 5
+y 11
+end
 arch generate_scorpion
 x 5
 y 11
@@ -1117,10 +1117,6 @@ arch weak_wall_6
 x 10
 y 4
 end
-arch dirtfloor
-x 10
-y 5
-end
 arch magic_mouth
 msg
 Creak.
@@ -1131,6 +1127,10 @@ y 5
 end
 arch dirtfloor
 x 10
+y 5
+end
+arch dirtfloor
+x 10
 y 6
 end
 arch dirtfloor
diff --git a/quests/todd/aljwaf/crypt4 b/quests/todd/aljwaf/crypt4
index 433e45812..dbcb2ff59 100644
--- a/quests/todd/aljwaf/crypt4
+++ b/quests/todd/aljwaf/crypt4
@@ -657,10 +657,6 @@ arch dirtfloor
 x 6
 y 2
 end
-arch dirtfloor
-x 6
-y 3
-end
 arch magic_mouth
 msg
 You hear a faint muttering.
@@ -671,6 +667,10 @@ y 3
 end
 arch dirtfloor
 x 6
+y 3
+end
+arch dirtfloor
+x 6
 y 4
 end
 arch bwall_2_1_2
diff --git a/quests/todd/aljwaf/crypt5 b/quests/todd/aljwaf/crypt5
index bc929c636..b5b7192f6 100644
--- a/quests/todd/aljwaf/crypt5
+++ b/quests/todd/aljwaf/crypt5
@@ -290,32 +290,30 @@ end
 arch bwall_2_1_2
 x 5
 end
-arch dirtfloor
-x 5
-y 1
-end
 arch button_small
-invisible 1
 connected 4
 x 5
 y 1
 end
 arch dirtfloor
 x 5
-y 2
+y 1
 end
 arch dirtfloor
 x 5
-y 3
+y 2
 end
 arch button_small
-invisible 1
 connected 1
 x 5
 y 3
 end
 arch dirtfloor
 x 5
+y 3
+end
+arch dirtfloor
+x 5
 y 4
 end
 arch dirtfloor
@@ -330,13 +328,12 @@ arch dirtfloor
 x 5
 y 7
 end
-arch dirtfloor
+arch button_small
+connected 1
 x 5
 y 8
 end
-arch button_small
-invisible 1
-connected 1
+arch dirtfloor
 x 5
 y 8
 end
@@ -370,32 +367,30 @@ arch dirtfloor
 x 6
 y 4
 end
-arch dirtfloor
-x 6
-y 5
-end
 arch button_small
-invisible 1
 connected 3
 x 6
 y 5
 end
 arch dirtfloor
 x 6
-y 6
+y 5
 end
 arch dirtfloor
 x 6
-y 7
+y 6
 end
 arch button_small
-invisible 1
 connected 5
 x 6
 y 7
 end
 arch dirtfloor
 x 6
+y 7
+end
+arch dirtfloor
+x 6
 y 8
 end
 arch dirtfloor
@@ -462,13 +457,12 @@ arch dirtfloor
 x 8
 y 1
 end
-arch dirtfloor
+arch button_small
+connected 1
 x 8
 y 2
 end
-arch button_small
-invisible 1
-connected 1
+arch dirtfloor
 x 8
 y 2
 end
@@ -491,13 +485,12 @@ arch dirtfloor
 x 8
 y 5
 end
-arch dirtfloor
+arch button_small
+connected 1
 x 8
 y 6
 end
-arch button_small
-invisible 1
-connected 1
+arch dirtfloor
 x 8
 y 6
 end
@@ -527,13 +520,12 @@ arch dirtfloor
 x 9
 y 1
 end
-arch dirtfloor
+arch button_small
+connected 5
 x 9
 y 2
 end
-arch button_small
-invisible 1
-connected 5
+arch dirtfloor
 x 9
 y 2
 end
@@ -553,32 +545,30 @@ endmsg
 x 9
 y 4
 end
-arch dirtfloor
-x 9
-y 5
-end
 arch button_small
-invisible 1
 connected 4
 x 9
 y 5
 end
 arch dirtfloor
 x 9
-y 6
+y 5
 end
 arch dirtfloor
 x 9
-y 7
+y 6
 end
 arch button_small
-invisible 1
 connected 2
 x 9
 y 7
 end
 arch dirtfloor
 x 9
+y 7
+end
+arch dirtfloor
+x 9
 y 8
 end
 arch dirtfloor
@@ -623,18 +613,17 @@ arch dirtfloor
 x 10
 y 7
 end
-arch dirtfloor
-x 10
-y 8
-end
 arch button_small
-invisible 1
 connected 1
 x 10
 y 8
 end
 arch dirtfloor
 x 10
+y 8
+end
+arch dirtfloor
+x 10
 y 9
 end
 arch bwall_2_1_2
@@ -647,13 +636,12 @@ end
 arch bwall_2_1_2
 x 11
 end
-arch dirtfloor
+arch button_small
+connected 1
 x 11
 y 1
 end
-arch button_small
-invisible 1
-connected 1
+arch dirtfloor
 x 11
 y 1
 end
@@ -669,32 +657,30 @@ arch dirtfloor
 x 11
 y 4
 end
-arch dirtfloor
-x 11
-y 5
-end
 arch button_small
-invisible 1
 connected 5
 x 11
 y 5
 end
 arch dirtfloor
 x 11
-y 6
+y 5
 end
 arch dirtfloor
 x 11
-y 7
+y 6
 end
 arch button_small
-invisible 1
 connected 4
 x 11
 y 7
 end
 arch dirtfloor
 x 11
+y 7
+end
+arch dirtfloor
+x 11
 y 8
 end
 arch dirtfloor
@@ -715,13 +701,12 @@ arch dirtfloor
 x 12
 y 1
 end
-arch dirtfloor
+arch button_small
+connected 2
 x 12
 y 2
 end
-arch button_small
-invisible 1
-connected 2
+arch dirtfloor
 x 12
 y 2
 end
@@ -763,13 +748,12 @@ end
 arch bwall_2_1_2
 x 13
 end
-arch dirtfloor
+arch button_small
+connected 4
 x 13
 y 1
 end
-arch button_small
-invisible 1
-connected 4
+arch dirtfloor
 x 13
 y 1
 end
@@ -781,46 +765,43 @@ arch dirtfloor
 x 13
 y 3
 end
-arch dirtfloor
-x 13
-y 4
-end
 arch button_small
-invisible 1
 connected 1
 x 13
 y 4
 end
 arch dirtfloor
 x 13
-y 5
+y 4
 end
 arch dirtfloor
 x 13
-y 6
+y 5
 end
 arch button_small
-invisible 1
 connected 5
 x 13
 y 6
 end
 arch dirtfloor
 x 13
-y 7
+y 6
 end
 arch dirtfloor
 x 13
-y 8
+y 7
 end
 arch button_small
-invisible 1
 connected 2
 x 13
 y 8
 end
 arch dirtfloor
 x 13
+y 8
+end
+arch dirtfloor
+x 13
 y 9
 end
 arch bwall_2_1_2
@@ -883,56 +864,52 @@ arch dirtfloor
 x 15
 y 1
 end
-arch dirtfloor
-x 15
-y 2
-end
 arch button_small
-invisible 1
 connected 3
 x 15
 y 2
 end
 arch dirtfloor
 x 15
-y 3
+y 2
 end
 arch dirtfloor
 x 15
-y 4
+y 3
 end
 arch button_small
-invisible 1
 connected 2
 x 15
 y 4
 end
 arch dirtfloor
 x 15
-y 5
+y 4
 end
 arch button_small
-invisible 1
 connected 4
 x 15
 y 5
 end
 arch dirtfloor
 x 15
+y 5
+end
+arch dirtfloor
+x 15
 y 6
 end
-arch dirtfloor
-x 15
-y 7
-end
 arch button_small
-invisible 1
 connected 1
 x 15
 y 7
 end
 arch dirtfloor
 x 15
+y 7
+end
+arch dirtfloor
+x 15
 y 8
 end
 arch dirtfloor
@@ -949,18 +926,17 @@ end
 arch bwall_2_1_2
 x 16
 end
-arch dirtfloor
-x 16
-y 1
-end
 arch button_small
-invisible 1
 connected 5
 x 16
 y 1
 end
 arch dirtfloor
 x 16
+y 1
+end
+arch dirtfloor
+x 16
 y 2
 end
 arch dirtfloor
@@ -1005,13 +981,12 @@ arch dirtfloor
 x 17
 y 1
 end
-arch dirtfloor
+arch button_small
+connected 4
 x 17
 y 2
 end
-arch button_small
-invisible 1
-connected 4
+arch dirtfloor
 x 17
 y 2
 end
@@ -1019,13 +994,12 @@ arch dirtfloor
 x 17
 y 3
 end
-arch dirtfloor
+arch button_small
+connected 3
 x 17
 y 4
 end
-arch button_small
-invisible 1
-connected 3
+arch dirtfloor
 x 17
 y 4
 end
@@ -1037,13 +1011,12 @@ arch dirtfloor
 x 17
 y 6
 end
-arch dirtfloor
+arch button_small
+connected 3
 x 17
 y 7
 end
-arch button_small
-invisible 1
-connected 3
+arch dirtfloor
 x 17
 y 7
 end
@@ -1104,13 +1077,12 @@ endmsg
 x 18
 y 7
 end
-arch dirtfloor
+arch button_small
+connected 2
 x 18
 y 8
 end
-arch button_small
-invisible 1
-connected 2
+arch dirtfloor
 x 18
 y 8
 end
diff --git a/quests/todd/aljwaf/hall1 b/quests/todd/aljwaf/hall1
index f596f54b1..f968c02eb 100644
--- a/quests/todd/aljwaf/hall1
+++ b/quests/todd/aljwaf/hall1
@@ -55,9 +55,6 @@ end
 arch biglake_2_2_1
 y 8
 end
-arch stonefloor2
-y 9
-end
 arch invis_exit
 slaying crypt
 hp 6
@@ -65,7 +62,7 @@ sp 9
 y 9
 end
 arch stonefloor2
-y 10
+y 9
 end
 arch invis_exit
 slaying crypt
@@ -74,7 +71,7 @@ sp 9
 y 10
 end
 arch stonefloor2
-y 11
+y 10
 end
 arch invis_exit
 slaying crypt
@@ -83,12 +80,15 @@ sp 9
 y 11
 end
 arch stonefloor2
+y 11
+end
+arch invis_exit
+slaying crypt
+hp 6
+sp 9
 y 12
 end
-arch invis_exit
-slaying crypt
-hp 6
-sp 9
+arch stonefloor2
 y 12
 end
 arch stonefloor2
@@ -124,9 +124,6 @@ end
 arch dun_1_4
 y 20
 end
-arch stonefloor2
-y 21
-end
 arch invis_exit
 slaying hall2
 hp 28
@@ -134,7 +131,7 @@ sp 13
 y 21
 end
 arch stonefloor2
-y 22
+y 21
 end
 arch invis_exit
 slaying hall2
@@ -143,7 +140,7 @@ sp 14
 y 22
 end
 arch stonefloor2
-y 23
+y 22
 end
 arch invis_exit
 slaying hall2
@@ -152,6 +149,9 @@ sp 15
 y 23
 end
 arch stonefloor2
+y 23
+end
+arch stonefloor2
 y 24
 end
 arch dun_1_4
@@ -2891,6 +2891,17 @@ can_use_bow 1
 x 17
 y 15
 end
+arch magic_mouth
+msg
+Clink!
+endmsg
+connected 4
+walk_on 0
+fly_on 0
+food 1
+x 17
+y 16
+end
 arch cobblestones
 x 17
 y 16
@@ -2903,17 +2914,6 @@ arch bwall_0
 x 17
 y 16
 end
-arch magic_mouth
-msg
-Clink!
-endmsg
-connected 4
-walk_on 0
-fly_on 0
-food 1
-x 17
-y 16
-end
 arch cobblestones
 x 17
 y 17
diff --git a/quests/todd/aljwaf/hall2 b/quests/todd/aljwaf/hall2
index 3c5ec1686..d28186758 100644
--- a/quests/todd/aljwaf/hall2
+++ b/quests/todd/aljwaf/hall2
@@ -907,9 +907,6 @@ arch dun_2_1_2
 x 4
 y 29
 end
-arch dun_2_1_2
-x 5
-end
 arch magic_mouth
 msg
 Go to your doom robber!
@@ -919,6 +916,9 @@ walk_on 0
 fly_on 0
 x 5
 end
+arch dun_2_1_2
+x 5
+end
 arch marble
 x 5
 y 1
@@ -1933,9 +1933,6 @@ arch dun_2_1_2
 x 9
 y 29
 end
-arch dun_2_1_2
-x 10
-end
 arch magic_mouth
 msg
 Shazzamm!
@@ -1945,6 +1942,9 @@ walk_on 0
 fly_on 0
 x 10
 end
+arch dun_2_1_2
+x 10
+end
 arch marble
 x 10
 y 1
@@ -3289,14 +3289,6 @@ arch rock
 x 16
 y 21
 end
-arch stonefloor2
-x 16
-y 22
-end
-arch dun_1_3
-x 16
-y 22
-end
 arch magic_mouth
 msg
 Clank!
@@ -3309,16 +3301,23 @@ y 22
 end
 arch stonefloor2
 x 16
-y 23
+y 22
+end
+arch dun_1_3
+x 16
+y 22
 end
 arch button_small
-invisible 1
 connected 10
 x 16
 y 23
 end
 arch stonefloor2
 x 16
+y 23
+end
+arch stonefloor2
+x 16
 y 24
 end
 arch dun_2_1_2
@@ -3826,10 +3825,6 @@ connected 1
 x 19
 y 1
 end
-arch stonefloor2
-x 19
-y 2
-end
 arch magic_mouth
 msg
 Halt! Who goes there?
@@ -3841,6 +3836,10 @@ y 2
 end
 arch stonefloor2
 x 19
+y 2
+end
+arch stonefloor2
+x 19
 y 3
 end
 arch stonefloor2
@@ -5675,10 +5674,6 @@ arch dun_2_2_4
 x 29
 y 12
 end
-arch stonefloor2
-x 29
-y 13
-end
 arch invis_exit
 slaying hall1
 hp 1
@@ -5688,7 +5683,7 @@ y 13
 end
 arch stonefloor2
 x 29
-y 14
+y 13
 end
 arch invis_exit
 slaying hall1
@@ -5699,7 +5694,7 @@ y 14
 end
 arch stonefloor2
 x 29
-y 15
+y 14
 end
 arch invis_exit
 slaying hall1
@@ -5710,6 +5705,10 @@ y 15
 end
 arch stonefloor2
 x 29
+y 15
+end
+arch stonefloor2
+x 29
 y 16
 end
 arch dun_2_2_3
diff --git a/quests/todd/aljwaf/ruins b/quests/todd/aljwaf/ruins
index fa11bd2fb..a3d31cd01 100644
--- a/quests/todd/aljwaf/ruins
+++ b/quests/todd/aljwaf/ruins
@@ -1967,10 +1967,6 @@ arch cobblestones
 x 13
 y 16
 end
-arch desert
-x 13
-y 17
-end
 arch magic_mouth
 msg
 The wind howls.
@@ -1981,6 +1977,10 @@ fly_on 0
 x 13
 y 17
 end
+arch desert
+x 13
+y 17
+end
 arch cobblestones
 x 13
 y 18
@@ -2084,14 +2084,6 @@ arch bwall_2_2_3
 x 14
 y 10
 end
-arch desert
-x 14
-y 11
-end
-arch bwall_2_2_1
-x 14
-y 11
-end
 arch magic_mouth
 msg
 Dust clogs your nose, it's hard to see.
@@ -2104,6 +2096,14 @@ y 11
 end
 arch desert
 x 14
+y 11
+end
+arch bwall_2_2_1
+x 14
+y 11
+end
+arch desert
+x 14
 y 12
 end
 arch small_stones
@@ -2887,10 +2887,6 @@ arch bwall_2_1_1
 x 19
 y 10
 end
-arch bwall_4
-x 19
-y 11
-end
 arch magic_mouth
 msg
 Ooooooo beware the Dusty Death...
@@ -2902,6 +2898,10 @@ food 1
 x 19
 y 11
 end
+arch bwall_4
+x 19
+y 11
+end
 arch desert
 x 19
 y 12
@@ -3590,6 +3590,13 @@ arch desert
 x 23
 y 22
 end
+arch invis_exit
+slaying /world/world_122_111
+hp 11
+sp 26
+x 23
+y 23
+end
 arch desert
 x 23
 y 23
@@ -3598,13 +3605,6 @@ arch paved_1_3
 x 23
 y 23
 end
-arch invis_exit
-slaying /world/world_122_111
-hp 11
-sp 26
-x 23
-y 23
-end
 arch desert
 x 23
 y 24
@@ -3729,14 +3729,6 @@ arch desert
 x 24
 y 22
 end
-arch desert
-x 24
-y 23
-end
-arch paved_1_3
-x 24
-y 23
-end
 arch invis_exit
 slaying /world/world_122_111
 hp 11
@@ -3746,5 +3738,13 @@ y 23
 end
 arch desert
 x 24
+y 23
+end
+arch paved_1_3
+x 24
+y 23
+end
+arch desert
+x 24
 y 24
 end
diff --git a/quests/todd/aljwaf/tower1 b/quests/todd/aljwaf/tower1
index 251999bbd..e74a22976 100644
--- a/quests/todd/aljwaf/tower1
+++ b/quests/todd/aljwaf/tower1
@@ -580,10 +580,6 @@ arch cobblestones
 x 6
 y 11
 end
-arch cobblestones
-x 6
-y 12
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 31
@@ -591,6 +587,10 @@ sp 37
 x 6
 y 12
 end
+arch cobblestones
+x 6
+y 12
+end
 arch pstone_1
 x 7
 end
diff --git a/quests/todd/aljwaf/tower2 b/quests/todd/aljwaf/tower2
index ea4db4a86..824c804a2 100644
--- a/quests/todd/aljwaf/tower2
+++ b/quests/todd/aljwaf/tower2
@@ -29,6 +29,12 @@ end
 arch bwall_1_2
 y 3
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 21
+sp 27
+y 4
+end
 arch pstone_1
 y 4
 end
@@ -39,7 +45,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 21
 sp 27
-y 4
+y 5
 end
 arch pstone_1
 y 5
@@ -50,12 +56,6 @@ end
 arch cobblestones
 y 5
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 21
-sp 27
-y 5
-end
 arch pstone_1
 y 6
 end
@@ -74,15 +74,6 @@ end
 arch bwall_1_2
 y 7
 end
-arch cobblestones
-y 8
-end
-arch cobblestones
-y 8
-end
-arch cobblestones
-y 8
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 21
@@ -90,6 +81,15 @@ sp 27
 y 8
 end
 arch cobblestones
+y 8
+end
+arch cobblestones
+y 8
+end
+arch cobblestones
+y 8
+end
+arch cobblestones
 y 9
 end
 arch bwall_1_1
@@ -559,10 +559,6 @@ arch cobblestones
 x 6
 y 11
 end
-arch cobblestones
-x 6
-y 12
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 21
@@ -570,6 +566,10 @@ sp 27
 x 6
 y 12
 end
+arch cobblestones
+x 6
+y 12
+end
 arch pstone_1
 x 7
 end
@@ -976,14 +976,6 @@ arch bwall_1_2
 x 12
 y 4
 end
-arch cobblestones
-x 12
-y 5
-end
-arch cobblestones
-x 12
-y 5
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 21
@@ -991,13 +983,13 @@ sp 27
 x 12
 y 5
 end
-arch pstone_1
+arch cobblestones
 x 12
-y 6
+y 5
 end
 arch cobblestones
 x 12
-y 6
+y 5
 end
 arch invis_exit
 slaying /world/world_119_116
@@ -1008,11 +1000,11 @@ y 6
 end
 arch pstone_1
 x 12
-y 7
+y 6
 end
 arch cobblestones
 x 12
-y 7
+y 6
 end
 arch invis_exit
 slaying /world/world_119_116
@@ -1023,6 +1015,14 @@ y 7
 end
 arch pstone_1
 x 12
+y 7
+end
+arch cobblestones
+x 12
+y 7
+end
+arch pstone_1
+x 12
 y 8
 end
 arch bwall_1_1
diff --git a/quests/todd/aljwaf/tower3 b/quests/todd/aljwaf/tower3
index d5f0214ab..af75615e6 100644
--- a/quests/todd/aljwaf/tower3
+++ b/quests/todd/aljwaf/tower3
@@ -34,6 +34,12 @@ end
 arch bwall_1_2
 y 3
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 29
+sp 26
+y 4
+end
 arch pstone_1
 y 4
 end
@@ -44,7 +50,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
-y 4
+y 5
 end
 arch pstone_1
 y 5
@@ -56,7 +62,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
-y 5
+y 6
 end
 arch pstone_1
 y 6
@@ -64,12 +70,6 @@ end
 arch cobblestones
 y 6
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 29
-sp 26
-y 6
-end
 arch cobblestones
 y 7
 end
@@ -408,12 +408,6 @@ arch bwall_2_1_2
 x 4
 y 12
 end
-arch pstone_1
-x 5
-end
-arch cobblestones
-x 5
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -422,6 +416,12 @@ x 5
 end
 arch pstone_1
 x 5
+end
+arch cobblestones
+x 5
+end
+arch pstone_1
+x 5
 y 1
 end
 arch cobblestones
@@ -522,12 +522,6 @@ arch bwall_1_3
 x 5
 y 12
 end
-arch pstone_1
-x 6
-end
-arch cobblestones
-x 6
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -536,6 +530,12 @@ x 6
 end
 arch pstone_1
 x 6
+end
+arch cobblestones
+x 6
+end
+arch pstone_1
+x 6
 y 1
 end
 arch pstone_1
@@ -592,6 +592,13 @@ arch cobblestones
 x 6
 y 11
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 29
+sp 26
+x 6
+y 12
+end
 arch cobblestones
 x 6
 y 12
@@ -600,8 +607,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
-x 6
-y 12
+x 7
 end
 arch pstone_1
 x 7
@@ -609,12 +615,6 @@ end
 arch cobblestones
 x 7
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 29
-sp 26
-x 7
-end
 arch cobblestones
 x 7
 y 1
@@ -671,18 +671,18 @@ arch bwall_1_4
 x 7
 y 12
 end
-arch pstone_1
-x 8
-end
-arch cobblestones
-x 8
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
 x 8
 end
+arch pstone_1
+x 8
+end
+arch cobblestones
+x 8
+end
 arch cobblestones
 x 8
 y 1
@@ -1753,10 +1753,6 @@ arch pstone_1
 x 23
 y 1
 end
-arch pstone_1
-x 23
-y 2
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -1766,7 +1762,7 @@ y 2
 end
 arch pstone_1
 x 23
-y 3
+y 2
 end
 arch invis_exit
 slaying /world/world_119_116
@@ -1777,7 +1773,7 @@ y 3
 end
 arch pstone_1
 x 23
-y 4
+y 3
 end
 arch invis_exit
 slaying /world/world_119_116
@@ -1788,12 +1784,16 @@ y 4
 end
 arch pstone_1
 x 23
+y 4
+end
+arch invis_exit
+slaying /world/world_119_116
+hp 29
+sp 26
+x 23
 y 5
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 29
-sp 26
+arch pstone_1
 x 23
 y 5
 end
@@ -2161,15 +2161,15 @@ arch pstone_1
 x 27
 y 12
 end
-arch pstone_1
-x 28
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
 x 28
 end
+arch pstone_1
+x 28
+end
 arch woodfloor2
 x 28
 y 1
@@ -2236,15 +2236,15 @@ arch pstone_1
 x 28
 y 12
 end
-arch pstone_1
-x 29
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
 x 29
 end
+arch pstone_1
+x 29
+end
 arch woodfloor2
 x 29
 y 1
@@ -2324,15 +2324,15 @@ arch pstone_1
 x 29
 y 12
 end
-arch pstone_1
-x 30
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
 sp 26
 x 30
 end
+arch pstone_1
+x 30
+end
 arch woodfloor2
 x 30
 y 1
@@ -2413,10 +2413,6 @@ arch bwall_1_3
 x 30
 y 11
 end
-arch pstone_1
-x 30
-y 12
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -2425,12 +2421,16 @@ x 30
 y 12
 end
 arch pstone_1
+x 30
+y 12
+end
+arch invis_exit
+slaying /world/world_119_116
+hp 29
+sp 26
 x 31
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 29
-sp 26
+arch pstone_1
 x 31
 end
 arch woodfloor2
@@ -2509,10 +2509,6 @@ sp 11
 x 31
 y 11
 end
-arch pstone_1
-x 31
-y 12
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -2521,6 +2517,10 @@ x 31
 y 12
 end
 arch pstone_1
+x 31
+y 12
+end
+arch pstone_1
 x 32
 end
 arch woodfloor2
@@ -2591,10 +2591,6 @@ arch bwall_1_4
 x 32
 y 11
 end
-arch pstone_1
-x 32
-y 12
-end
 arch invis_exit
 slaying /world/world_119_116
 hp 29
@@ -2603,6 +2599,10 @@ x 32
 y 12
 end
 arch pstone_1
+x 32
+y 12
+end
+arch pstone_1
 x 33
 end
 arch woodfloor2
diff --git a/quests/todd/aljwaf/tower4 b/quests/todd/aljwaf/tower4
index e63af4c6c..44d710cfb 100644
--- a/quests/todd/aljwaf/tower4
+++ b/quests/todd/aljwaf/tower4
@@ -30,6 +30,12 @@ end
 arch bwall_1_2
 y 3
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 37
+sp 7
+y 4
+end
 arch pstone_1
 y 4
 end
@@ -40,7 +46,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 37
 sp 7
-y 4
+y 5
 end
 arch pstone_1
 y 5
@@ -48,12 +54,6 @@ end
 arch cobblestones
 y 5
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 37
-sp 7
-y 5
-end
 arch pstone_1
 y 6
 end
@@ -528,6 +528,13 @@ arch cobblestones
 x 6
 y 11
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 37
+sp 7
+x 6
+y 12
+end
 arch cobblestones
 x 6
 y 12
@@ -536,8 +543,7 @@ arch invis_exit
 slaying /world/world_119_116
 hp 37
 sp 7
-x 6
-y 12
+x 7
 end
 arch pstone_1
 x 7
@@ -545,12 +551,6 @@ end
 arch cobblestones
 x 7
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 37
-sp 7
-x 7
-end
 arch cobblestones
 x 7
 y 1
@@ -869,6 +869,13 @@ arch spider_gen
 x 11
 y 11
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 37
+sp 7
+x 11
+y 12
+end
 arch pstone_1
 x 11
 y 12
@@ -877,13 +884,6 @@ arch cobblestones
 x 11
 y 12
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 37
-sp 7
-x 11
-y 12
-end
 arch pstone_1
 x 12
 end
@@ -967,6 +967,13 @@ arch bwall_1_2
 x 12
 y 9
 end
+arch invis_exit
+slaying /world/world_119_116
+hp 37
+sp 7
+x 12
+y 10
+end
 arch pstone_1
 x 12
 y 10
@@ -980,7 +987,7 @@ slaying /world/world_119_116
 hp 37
 sp 7
 x 12
-y 10
+y 11
 end
 arch pstone_1
 x 12
@@ -995,7 +1002,7 @@ slaying /world/world_119_116
 hp 37
 sp 7
 x 12
-y 11
+y 12
 end
 arch pstone_1
 x 12
@@ -1005,10 +1012,3 @@ arch cobblestones
 x 12
 y 12
 end
-arch invis_exit
-slaying /world/world_119_116
-hp 37
-sp 7
-x 12
-y 12
-end