diff --git a/navar_city/mlab/ttower15 b/navar_city/mlab/ttower15
index 99126e8ea..3325d977e 100644
--- a/navar_city/mlab/ttower15
+++ b/navar_city/mlab/ttower15
@@ -610,6 +610,18 @@ arch cwall_0
 x 4
 y 4
 end
+arch dungeon_magic
+x 4
+y 5
+end
+arch magic_banned
+x 4
+y 5
+end
+arch unholy_ground
+x 4
+y 5
+end
 arch stonefloor2
 name stonefloor
 x 4
@@ -621,15 +633,15 @@ y 5
 end
 arch dungeon_magic
 x 4
-y 5
+y 6
 end
 arch magic_banned
 x 4
-y 5
+y 6
 end
 arch unholy_ground
 x 4
-y 5
+y 6
 end
 arch stonefloor2
 name stonefloor
@@ -640,18 +652,6 @@ arch swall_2_2_4
 x 4
 y 6
 end
-arch dungeon_magic
-x 4
-y 6
-end
-arch magic_banned
-x 4
-y 6
-end
-arch unholy_ground
-x 4
-y 6
-end
 arch invis_exit
 slaying ttower14
 hp 4
@@ -716,6 +716,18 @@ arch chole_1
 x 4
 y 10
 end
+arch dungeon_magic
+x 4
+y 11
+end
+arch magic_banned
+x 4
+y 11
+end
+arch unholy_ground
+x 4
+y 11
+end
 arch stonefloor2
 name stonefloor
 x 4
@@ -727,15 +739,15 @@ y 11
 end
 arch dungeon_magic
 x 4
-y 11
+y 12
 end
 arch magic_banned
 x 4
-y 11
+y 12
 end
 arch unholy_ground
 x 4
-y 11
+y 12
 end
 arch stonefloor2
 name stonefloor
@@ -746,18 +758,6 @@ arch swall_2_2_1
 x 4
 y 12
 end
-arch dungeon_magic
-x 4
-y 12
-end
-arch magic_banned
-x 4
-y 12
-end
-arch unholy_ground
-x 4
-y 12
-end
 arch dungeon_floor
 x 4
 y 13
@@ -836,6 +836,18 @@ y 3
 move_block 0
 blocksview 0
 end
+arch dungeon_magic
+x 5
+y 4
+end
+arch magic_banned
+x 5
+y 4
+end
+arch unholy_ground
+x 5
+y 4
+end
 arch stonefloor2
 name stonefloor
 x 5
@@ -847,15 +859,15 @@ y 4
 end
 arch dungeon_magic
 x 5
-y 4
+y 5
 end
 arch magic_banned
 x 5
-y 4
+y 5
 end
 arch unholy_ground
 x 5
-y 4
+y 5
 end
 arch stonefloor2
 name stonefloor
@@ -866,18 +878,6 @@ arch swall_2_2_4
 x 5
 y 5
 end
-arch dungeon_magic
-x 5
-y 5
-end
-arch magic_banned
-x 5
-y 5
-end
-arch unholy_ground
-x 5
-y 5
-end
 arch invis_exit
 slaying ttower14
 hp 5
@@ -951,6 +951,18 @@ arch chole_1
 x 5
 y 11
 end
+arch dungeon_magic
+x 5
+y 12
+end
+arch magic_banned
+x 5
+y 12
+end
+arch unholy_ground
+x 5
+y 12
+end
 arch stonefloor2
 name stonefloor
 x 5
@@ -962,15 +974,15 @@ y 12
 end
 arch dungeon_magic
 x 5
-y 12
+y 13
 end
 arch magic_banned
 x 5
-y 12
+y 13
 end
 arch unholy_ground
 x 5
-y 12
+y 13
 end
 arch stonefloor2
 name stonefloor
@@ -981,18 +993,6 @@ arch swall_2_2_1
 x 5
 y 13
 end
-arch dungeon_magic
-x 5
-y 13
-end
-arch magic_banned
-x 5
-y 13
-end
-arch unholy_ground
-x 5
-y 13
-end
 arch blocked
 name nothing
 x 5
@@ -1068,15 +1068,6 @@ arch cwall_1_4
 x 6
 y 3
 end
-arch stonefloor2
-name stonefloor
-x 6
-y 4
-end
-arch swall_2_2_4
-x 6
-y 4
-end
 arch dungeon_magic
 x 6
 y 4
@@ -1089,6 +1080,15 @@ arch unholy_ground
 x 6
 y 4
 end
+arch stonefloor2
+name stonefloor
+x 6
+y 4
+end
+arch swall_2_2_4
+x 6
+y 4
+end
 arch invis_exit
 slaying ttower14
 hp 6
@@ -1164,6 +1164,18 @@ arch skeletalmage
 x 6
 y 11
 end
+arch dungeon_magic
+x 6
+y 12
+end
+arch magic_banned
+x 6
+y 12
+end
+arch unholy_ground
+x 6
+y 12
+end
 arch woodfloor2
 name woodfloor
 x 6
@@ -1175,15 +1187,15 @@ y 12
 end
 arch dungeon_magic
 x 6
-y 12
+y 13
 end
 arch magic_banned
 x 6
-y 12
+y 13
 end
 arch unholy_ground
 x 6
-y 12
+y 13
 end
 arch stonefloor2
 name stonefloor
@@ -1194,18 +1206,6 @@ arch swall_2_2_3
 x 6
 y 13
 end
-arch dungeon_magic
-x 6
-y 13
-end
-arch magic_banned
-x 6
-y 13
-end
-arch unholy_ground
-x 6
-y 13
-end
 arch stonefloor2
 name stonefloor
 x 6
@@ -1359,15 +1359,6 @@ arch nightmare
 x 7
 y 11
 end
-arch woodfloor2
-name woodfloor
-x 7
-y 12
-end
-arch swall_2_1_2
-x 7
-y 12
-end
 arch dungeon_magic
 x 7
 y 12
@@ -1380,6 +1371,15 @@ arch unholy_ground
 x 7
 y 12
 end
+arch woodfloor2
+name woodfloor
+x 7
+y 12
+end
+arch swall_2_1_2
+x 7
+y 12
+end
 arch magic_mouth
 msg
 When the tower was completed there were no heavens to be found. Only clouds. The wizard knew nothing. The apprentice was the second wizard. He did not die. The second wizard grew herb and sustained for decades, then centuries, then longer. The herb was not of this world, it was of fire... for the wizard was useful, moreso than the last.
@@ -1562,15 +1562,6 @@ arch grimreaper
 x 8
 y 11
 end
-arch woodfloor2
-name woodfloor
-x 8
-y 12
-end
-arch swall_1_3
-x 8
-y 12
-end
 arch dungeon_magic
 x 8
 y 12
@@ -1586,6 +1577,15 @@ end
 arch woodfloor2
 name woodfloor
 x 8
+y 12
+end
+arch swall_1_3
+x 8
+y 12
+end
+arch woodfloor2
+name woodfloor
+x 8
 y 13
 end
 arch spikes_closed
@@ -1739,17 +1739,6 @@ arch nightmare
 x 9
 y 11
 end
-arch woodfloor2
-name woodfloor
-x 9
-y 12
-end
-arch grate_closed_1
-x 9
-y 12
-speed 0.500000
-connected 3
-end
 arch dungeon_magic
 x 9
 y 12
@@ -1765,6 +1754,17 @@ end
 arch woodfloor2
 name woodfloor
 x 9
+y 12
+end
+arch grate_closed_1
+x 9
+y 12
+speed 0.500000
+connected 3
+end
+arch woodfloor2
+name woodfloor
+x 9
 y 13
 end
 arch spikes_closed
@@ -1930,15 +1930,6 @@ arch grimreaper
 x 10
 y 11
 end
-arch woodfloor2
-name woodfloor
-x 10
-y 12
-end
-arch swall_1_4
-x 10
-y 12
-end
 arch dungeon_magic
 x 10
 y 12
@@ -1954,6 +1945,15 @@ end
 arch woodfloor2
 name woodfloor
 x 10
+y 12
+end
+arch swall_1_4
+x 10
+y 12
+end
+arch woodfloor2
+name woodfloor
+x 10
 y 13
 end
 arch spikes_closed
@@ -2047,15 +2047,6 @@ arch cwall_1_3
 x 11
 y 3
 end
-arch stonefloor2
-name stonefloor
-x 11
-y 4
-end
-arch swall_2_2_1
-x 11
-y 4
-end
 arch dungeon_magic
 x 11
 y 4
@@ -2068,6 +2059,15 @@ arch unholy_ground
 x 11
 y 4
 end
+arch stonefloor2
+name stonefloor
+x 11
+y 4
+end
+arch swall_2_2_1
+x 11
+y 4
+end
 arch invis_exit
 slaying ttower14
 hp 11
@@ -2143,6 +2143,18 @@ arch skeletalmage
 x 11
 y 11
 end
+arch dungeon_magic
+x 11
+y 12
+end
+arch magic_banned
+x 11
+y 12
+end
+arch unholy_ground
+x 11
+y 12
+end
 arch woodfloor2
 name woodfloor
 x 11
@@ -2154,15 +2166,15 @@ y 12
 end
 arch dungeon_magic
 x 11
-y 12
+y 13
 end
 arch magic_banned
 x 11
-y 12
+y 13
 end
 arch unholy_ground
 x 11
-y 12
+y 13
 end
 arch stonefloor2
 name stonefloor
@@ -2173,18 +2185,6 @@ arch swall_2_2_2
 x 11
 y 13
 end
-arch dungeon_magic
-x 11
-y 13
-end
-arch magic_banned
-x 11
-y 13
-end
-arch unholy_ground
-x 11
-y 13
-end
 arch stonefloor2
 name stonefloor
 x 11
@@ -2261,6 +2261,18 @@ y 3
 move_block 0
 blocksview 0
 end
+arch dungeon_magic
+x 12
+y 4
+end
+arch magic_banned
+x 12
+y 4
+end
+arch unholy_ground
+x 12
+y 4
+end
 arch stonefloor2
 name stonefloor
 x 12
@@ -2272,15 +2284,15 @@ y 4
 end
 arch dungeon_magic
 x 12
-y 4
+y 5
 end
 arch magic_banned
 x 12
-y 4
+y 5
 end
 arch unholy_ground
 x 12
-y 4
+y 5
 end
 arch stonefloor2
 name stonefloor
@@ -2291,18 +2303,6 @@ arch swall_2_2_1
 x 12
 y 5
 end
-arch dungeon_magic
-x 12
-y 5
-end
-arch magic_banned
-x 12
-y 5
-end
-arch unholy_ground
-x 12
-y 5
-end
 arch invis_exit
 slaying ttower14
 hp 12
@@ -2376,6 +2376,18 @@ arch chole_1
 x 12
 y 11
 end
+arch dungeon_magic
+x 12
+y 12
+end
+arch magic_banned
+x 12
+y 12
+end
+arch unholy_ground
+x 12
+y 12
+end
 arch stonefloor2
 name stonefloor
 x 12
@@ -2387,15 +2399,15 @@ y 12
 end
 arch dungeon_magic
 x 12
-y 12
+y 13
 end
 arch magic_banned
 x 12
-y 12
+y 13
 end
 arch unholy_ground
 x 12
-y 12
+y 13
 end
 arch stonefloor2
 name stonefloor
@@ -2406,18 +2418,6 @@ arch swall_2_2_4
 x 12
 y 13
 end
-arch dungeon_magic
-x 12
-y 13
-end
-arch magic_banned
-x 12
-y 13
-end
-arch unholy_ground
-x 12
-y 13
-end
 arch blocked
 name nothing
 x 12
@@ -2495,6 +2495,18 @@ arch cwall_0
 x 13
 y 4
 end
+arch dungeon_magic
+x 13
+y 5
+end
+arch magic_banned
+x 13
+y 5
+end
+arch unholy_ground
+x 13
+y 5
+end
 arch stonefloor2
 name stonefloor
 x 13
@@ -2506,15 +2518,15 @@ y 5
 end
 arch dungeon_magic
 x 13
-y 5
+y 6
 end
 arch magic_banned
 x 13
-y 5
+y 6
 end
 arch unholy_ground
 x 13
-y 5
+y 6
 end
 arch stonefloor2
 name stonefloor
@@ -2525,18 +2537,6 @@ arch swall_2_2_1
 x 13
 y 6
 end
-arch dungeon_magic
-x 13
-y 6
-end
-arch magic_banned
-x 13
-y 6
-end
-arch unholy_ground
-x 13
-y 6
-end
 arch invis_exit
 slaying ttower14
 hp 13
@@ -2601,6 +2601,18 @@ arch chole_1
 x 13
 y 10
 end
+arch dungeon_magic
+x 13
+y 11
+end
+arch magic_banned
+x 13
+y 11
+end
+arch unholy_ground
+x 13
+y 11
+end
 arch stonefloor2
 name stonefloor
 x 13
@@ -2612,15 +2624,15 @@ y 11
 end
 arch dungeon_magic
 x 13
-y 11
+y 12
 end
 arch magic_banned
 x 13
-y 11
+y 12
 end
 arch unholy_ground
 x 13
-y 11
+y 12
 end
 arch stonefloor2
 name stonefloor
@@ -2631,18 +2643,6 @@ arch swall_2_2_4
 x 13
 y 12
 end
-arch dungeon_magic
-x 13
-y 12
-end
-arch magic_banned
-x 13
-y 12
-end
-arch unholy_ground
-x 13
-y 12
-end
 arch dungeon_floor
 x 13
 y 13