diff --git a/navar_city/jail/jail b/navar_city/jail/jail
index 6ad2ae4b7..07017c170 100644
--- a/navar_city/jail/jail
+++ b/navar_city/jail/jail
@@ -8,7 +8,7 @@ height 16
 enter_y 7
 msg
 Created:  2001-02-17
-Modified: 2008-05-30 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch dungeon_magic
@@ -179,10 +179,6 @@ end
 arch westcwall_2_1_2
 x 1
 end
-arch dungeon_magic
-x 1
-y 1
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -202,10 +198,6 @@ arch bed_save
 x 1
 y 1
 end
-arch dungeon_magic
-x 1
-y 2
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -221,10 +213,6 @@ arch flagstone
 x 1
 y 2
 end
-arch dungeon_magic
-x 1
-y 3
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -240,10 +228,6 @@ arch flagstone
 x 1
 y 3
 end
-arch dungeon_magic
-x 1
-y 4
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -307,10 +291,6 @@ arch swall_1_3
 x 1
 y 9
 end
-arch dungeon_magic
-x 1
-y 10
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -326,10 +306,6 @@ arch flagstone
 x 1
 y 10
 end
-arch dungeon_magic
-x 1
-y 11
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -345,10 +321,6 @@ arch flagstone
 x 1
 y 11
 end
-arch dungeon_magic
-x 1
-y 12
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -364,10 +336,6 @@ arch flagstone
 x 1
 y 12
 end
-arch dungeon_magic
-x 1
-y 13
-end
 arch check_inv
 slaying prisoner
 x 1
@@ -375,6 +343,10 @@ y 13
 last_sp 0
 connected 15
 end
+arch dungeon_magic
+x 1
+y 13
+end
 arch flagstone
 x 1
 y 13
@@ -412,10 +384,6 @@ end
 arch westcwall_2_1_2
 x 2
 end
-arch dungeon_magic
-x 2
-y 1
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -431,10 +399,6 @@ arch flagstone
 x 2
 y 1
 end
-arch dungeon_magic
-x 2
-y 2
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -450,10 +414,6 @@ arch flagstone
 x 2
 y 2
 end
-arch dungeon_magic
-x 2
-y 3
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -478,10 +438,6 @@ arch flagstone
 x 2
 y 3
 end
-arch dungeon_magic
-x 2
-y 4
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -497,10 +453,6 @@ arch flagstone
 x 2
 y 4
 end
-arch dungeon_magic
-x 2
-y 5
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -521,10 +473,6 @@ x 2
 y 5
 connected 16
 end
-arch dungeon_magic
-x 2
-y 6
-end
 arch check_inv
 slaying jailkey
 x 2
@@ -547,10 +495,6 @@ arch flagstone
 x 2
 y 7
 end
-arch dungeon_magic
-x 2
-y 8
-end
 arch check_inv
 slaying jailkey
 x 2
@@ -565,10 +509,6 @@ arch flagstone
 x 2
 y 8
 end
-arch dungeon_magic
-x 2
-y 9
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -589,10 +529,6 @@ x 2
 y 9
 connected 15
 end
-arch dungeon_magic
-x 2
-y 10
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -608,10 +544,6 @@ arch flagstone
 x 2
 y 10
 end
-arch dungeon_magic
-x 2
-y 11
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -636,10 +568,6 @@ arch flagstone
 x 2
 y 11
 end
-arch dungeon_magic
-x 2
-y 12
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -655,10 +583,6 @@ arch flagstone
 x 2
 y 12
 end
-arch dungeon_magic
-x 2
-y 13
-end
 arch check_inv
 slaying prisoner
 x 2
@@ -706,10 +630,6 @@ end
 arch westcwall_2_1_2
 x 3
 end
-arch dungeon_magic
-x 3
-y 1
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -743,10 +663,6 @@ arch table_4
 x 3
 y 1
 end
-arch dungeon_magic
-x 3
-y 2
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -762,10 +678,6 @@ arch flagstone
 x 3
 y 2
 end
-arch dungeon_magic
-x 3
-y 3
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -781,10 +693,6 @@ arch flagstone
 x 3
 y 3
 end
-arch dungeon_magic
-x 3
-y 4
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -848,10 +756,6 @@ arch swall_1_4
 x 3
 y 9
 end
-arch dungeon_magic
-x 3
-y 10
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -874,10 +778,6 @@ x 3
 y 10
 no_pick 1
 end
-arch dungeon_magic
-x 3
-y 11
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -893,10 +793,6 @@ arch flagstone
 x 3
 y 11
 end
-arch dungeon_magic
-x 3
-y 12
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -912,10 +808,6 @@ arch flagstone
 x 3
 y 12
 end
-arch dungeon_magic
-x 3
-y 13
-end
 arch check_inv
 slaying prisoner
 x 3
@@ -1182,10 +1074,6 @@ end
 arch westcwall_2_1_2
 x 5
 end
-arch dungeon_magic
-x 5
-y 1
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1205,10 +1093,6 @@ arch bed_save
 x 5
 y 1
 end
-arch dungeon_magic
-x 5
-y 2
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1224,10 +1108,6 @@ arch flagstone
 x 5
 y 2
 end
-arch dungeon_magic
-x 5
-y 3
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1243,10 +1123,6 @@ arch flagstone
 x 5
 y 3
 end
-arch dungeon_magic
-x 5
-y 4
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1310,10 +1186,6 @@ arch swall_1_3
 x 5
 y 9
 end
-arch dungeon_magic
-x 5
-y 10
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1329,10 +1201,6 @@ arch flagstone
 x 5
 y 10
 end
-arch dungeon_magic
-x 5
-y 11
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1348,10 +1216,6 @@ arch flagstone
 x 5
 y 11
 end
-arch dungeon_magic
-x 5
-y 12
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1367,10 +1231,6 @@ arch flagstone
 x 5
 y 12
 end
-arch dungeon_magic
-x 5
-y 13
-end
 arch check_inv
 slaying prisoner
 x 5
@@ -1423,10 +1283,6 @@ end
 arch westcwall_2_1_2
 x 6
 end
-arch dungeon_magic
-x 6
-y 1
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1442,10 +1298,6 @@ arch flagstone
 x 6
 y 1
 end
-arch dungeon_magic
-x 6
-y 2
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1461,10 +1313,6 @@ arch flagstone
 x 6
 y 2
 end
-arch dungeon_magic
-x 6
-y 3
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1489,10 +1337,6 @@ arch flagstone
 x 6
 y 3
 end
-arch dungeon_magic
-x 6
-y 4
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1508,10 +1352,6 @@ arch flagstone
 x 6
 y 4
 end
-arch dungeon_magic
-x 6
-y 5
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1532,10 +1372,6 @@ x 6
 y 5
 connected 14
 end
-arch dungeon_magic
-x 6
-y 6
-end
 arch check_inv
 slaying jailkey
 x 6
@@ -1558,10 +1394,6 @@ arch flagstone
 x 6
 y 7
 end
-arch dungeon_magic
-x 6
-y 8
-end
 arch check_inv
 slaying jailkey
 x 6
@@ -1576,10 +1408,6 @@ arch flagstone
 x 6
 y 8
 end
-arch dungeon_magic
-x 6
-y 9
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1600,10 +1428,6 @@ x 6
 y 9
 connected 13
 end
-arch dungeon_magic
-x 6
-y 10
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1619,10 +1443,6 @@ arch flagstone
 x 6
 y 10
 end
-arch dungeon_magic
-x 6
-y 11
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1647,10 +1467,6 @@ arch flagstone
 x 6
 y 11
 end
-arch dungeon_magic
-x 6
-y 12
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1666,10 +1482,6 @@ arch flagstone
 x 6
 y 12
 end
-arch dungeon_magic
-x 6
-y 13
-end
 arch check_inv
 slaying prisoner
 x 6
@@ -1717,10 +1529,6 @@ end
 arch westcwall_2_1_2
 x 7
 end
-arch dungeon_magic
-x 7
-y 1
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1754,10 +1562,6 @@ arch table_4
 x 7
 y 1
 end
-arch dungeon_magic
-x 7
-y 2
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1773,10 +1577,6 @@ arch flagstone
 x 7
 y 2
 end
-arch dungeon_magic
-x 7
-y 3
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1792,10 +1592,6 @@ arch flagstone
 x 7
 y 3
 end
-arch dungeon_magic
-x 7
-y 4
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1859,10 +1655,6 @@ arch swall_1_4
 x 7
 y 9
 end
-arch dungeon_magic
-x 7
-y 10
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1878,10 +1670,6 @@ arch flagstone
 x 7
 y 10
 end
-arch dungeon_magic
-x 7
-y 11
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1897,10 +1685,6 @@ arch flagstone
 x 7
 y 11
 end
-arch dungeon_magic
-x 7
-y 12
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -1916,10 +1700,6 @@ arch flagstone
 x 7
 y 12
 end
-arch dungeon_magic
-x 7
-y 13
-end
 arch check_inv
 slaying prisoner
 x 7
@@ -2186,10 +1966,6 @@ end
 arch westcwall_2_1_2
 x 9
 end
-arch dungeon_magic
-x 9
-y 1
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2209,10 +1985,6 @@ arch bed_save
 x 9
 y 1
 end
-arch dungeon_magic
-x 9
-y 2
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2228,10 +2000,6 @@ arch flagstone
 x 9
 y 2
 end
-arch dungeon_magic
-x 9
-y 3
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2247,10 +2015,6 @@ arch flagstone
 x 9
 y 3
 end
-arch dungeon_magic
-x 9
-y 4
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2314,10 +2078,6 @@ arch swall_1_3
 x 9
 y 9
 end
-arch dungeon_magic
-x 9
-y 10
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2333,10 +2093,6 @@ arch flagstone
 x 9
 y 10
 end
-arch dungeon_magic
-x 9
-y 11
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2352,10 +2108,6 @@ arch flagstone
 x 9
 y 11
 end
-arch dungeon_magic
-x 9
-y 12
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2371,10 +2123,6 @@ arch flagstone
 x 9
 y 12
 end
-arch dungeon_magic
-x 9
-y 13
-end
 arch check_inv
 slaying prisoner
 x 9
@@ -2427,10 +2175,6 @@ end
 arch westcwall_2_1_2
 x 10
 end
-arch dungeon_magic
-x 10
-y 1
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2446,10 +2190,6 @@ arch flagstone
 x 10
 y 1
 end
-arch dungeon_magic
-x 10
-y 2
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2465,10 +2205,6 @@ arch flagstone
 x 10
 y 2
 end
-arch dungeon_magic
-x 10
-y 3
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2493,10 +2229,6 @@ arch flagstone
 x 10
 y 3
 end
-arch dungeon_magic
-x 10
-y 4
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2512,10 +2244,6 @@ arch flagstone
 x 10
 y 4
 end
-arch dungeon_magic
-x 10
-y 5
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2536,10 +2264,6 @@ x 10
 y 5
 connected 12
 end
-arch dungeon_magic
-x 10
-y 6
-end
 arch check_inv
 slaying jailkey
 x 10
@@ -2562,10 +2286,6 @@ arch flagstone
 x 10
 y 7
 end
-arch dungeon_magic
-x 10
-y 8
-end
 arch check_inv
 slaying jailkey
 x 10
@@ -2580,10 +2300,6 @@ arch flagstone
 x 10
 y 8
 end
-arch dungeon_magic
-x 10
-y 9
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2604,10 +2320,6 @@ x 10
 y 9
 connected 11
 end
-arch dungeon_magic
-x 10
-y 10
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2623,10 +2335,6 @@ arch flagstone
 x 10
 y 10
 end
-arch dungeon_magic
-x 10
-y 11
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2651,10 +2359,6 @@ arch flagstone
 x 10
 y 11
 end
-arch dungeon_magic
-x 10
-y 12
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2670,10 +2374,6 @@ arch flagstone
 x 10
 y 12
 end
-arch dungeon_magic
-x 10
-y 13
-end
 arch check_inv
 slaying prisoner
 x 10
@@ -2721,10 +2421,6 @@ end
 arch westcwall_2_1_2
 x 11
 end
-arch dungeon_magic
-x 11
-y 1
-end
 arch check_inv
 slaying prisoner
 x 11
@@ -2846,10 +2542,6 @@ arch swall_1_4
 x 11
 y 9
 end
-arch dungeon_magic
-x 11
-y 10
-end
 arch check_inv
 slaying prisoner
 x 11
@@ -2865,10 +2557,6 @@ arch flagstone
 x 11
 y 10
 end
-arch dungeon_magic
-x 11
-y 11
-end
 arch check_inv
 slaying prisoner
 x 11
@@ -2884,10 +2572,6 @@ arch flagstone
 x 11
 y 11
 end
-arch dungeon_magic
-x 11
-y 12
-end
 arch check_inv
 slaying prisoner
 x 11
@@ -2903,10 +2587,6 @@ arch flagstone
 x 11
 y 12
 end
-arch dungeon_magic
-x 11
-y 13
-end
 arch check_inv
 slaying prisoner
 x 11
@@ -3687,10 +3367,6 @@ end
 arch blocked
 x 16
 end
-arch dungeon_magic
-x 16
-y 1
-end
 arch magic_mouth
 msg
 You have been jailed for 15 minutes
@@ -3736,10 +3412,6 @@ arch blocked
 x 16
 y 2
 end
-arch dungeon_magic
-x 16
-y 3
-end
 arch magic_mouth
 msg
 You have been jailed for 30 minutes
@@ -3785,10 +3457,6 @@ arch blocked
 x 16
 y 4
 end
-arch dungeon_magic
-x 16
-y 5
-end
 arch magic_mouth
 msg
 You have been jailed for 1 hour
@@ -3861,10 +3529,6 @@ arch blocked
 x 16
 y 8
 end
-arch dungeon_magic
-x 16
-y 9
-end
 arch magic_mouth
 msg
 You have been jailed for 2 hours
@@ -3910,10 +3574,6 @@ arch blocked
 x 16
 y 10
 end
-arch dungeon_magic
-x 16
-y 11
-end
 arch magic_mouth
 msg
 You have been jailed for 4 hours
@@ -3958,10 +3618,6 @@ arch blocked
 x 16
 y 12
 end
-arch dungeon_magic
-x 16
-y 13
-end
 arch magic_mouth
 msg
 You have been jailed for life