diff --git a/scorn/misc/cityhall b/scorn/misc/cityhall
index b2cfc63b0..cfea63f7e 100644
--- a/scorn/misc/cityhall
+++ b/scorn/misc/cityhall
@@ -1,16 +1,16 @@
 arch map
 name cityhall
-reset_timeout 7200
-difficulty 1
+msg
+Creator:
+Email:
+Date: Fri Oct 15 13:42:48 1993
+endmsg
 width 34
 height 32
 enter_x 13
 enter_y 25
-msg
-Creator: 
-Email: 
-Date: Fri Oct 15 13:42:48 1993
-endmsg
+reset_timeout 7200
+difficulty 1
 end
 arch woods_2
 end
@@ -439,9 +439,9 @@ x 2
 y 7
 end
 arch food
+nrof 10
 x 2
 y 7
-nrof 10
 end
 arch dungeon_magic
 x 2
@@ -1389,7 +1389,7 @@ x 6
 y 20
 end
 arch statue
-name Kjetil W Jørgensen
+name Kjetil W J?rgensen
 x 6
 y 20
 end
@@ -2652,9 +2652,9 @@ x 12
 y 9
 end
 arch pedestal
+connected 96
 x 12
 y 9
-connected 96
 end
 arch dungeon_floor
 x 12
@@ -2669,9 +2669,9 @@ x 12
 y 10
 end
 arch pedestal
+connected 96
 x 12
 y 11
-connected 96
 end
 arch cobblestones2
 x 12
@@ -2841,33 +2841,33 @@ x 13
 y 9
 end
 arch pedestal
+connected 96
 x 13
 y 9
-connected 96
 end
 arch dungeon_floor
 x 13
 y 9
 end
 arch pedestal
+connected 96
 x 13
 y 10
-connected 96
 end
 arch dungeon_floor
 x 13
 y 10
 end
 arch igate_closed_1
-x 13
-y 10
 speed 0.500000
 connected 96
+x 13
+y 10
 end
 arch pedestal
+connected 96
 x 13
 y 11
-connected 96
 end
 arch cobblestones2
 x 13
@@ -3035,33 +3035,33 @@ x 14
 y 9
 end
 arch pedestal
+connected 96
 x 14
 y 9
-connected 96
 end
 arch dungeon_floor
 x 14
 y 9
 end
 arch pedestal
+connected 96
 x 14
 y 10
-connected 96
 end
 arch dungeon_floor
 x 14
 y 10
 end
 arch igate_closed_1
-x 14
-y 10
 speed 0.500000
 connected 96
+x 14
+y 10
 end
 arch pedestal
+connected 96
 x 14
 y 11
-connected 96
 end
 arch cobblestones2
 x 14
@@ -3229,9 +3229,9 @@ x 15
 y 9
 end
 arch pedestal
+connected 96
 x 15
 y 9
-connected 96
 end
 arch dungeon_floor
 x 15
@@ -3246,9 +3246,9 @@ x 15
 y 10
 end
 arch pedestal
+connected 96
 x 15
 y 11
-connected 96
 end
 arch cobblestones2
 x 15
@@ -3624,7 +3624,7 @@ end
 arch book_read
 name History of Crossfire
 msg
-Frank Tore Johansen started writing 
+Frank Tore Johansen started writing
 Crossfire in march 1992.  Since then
 several people throughout the world
 have contributed with source, maps
@@ -4016,11 +4016,7 @@ arch grass
 x 18
 y 18
 end
-arch grass
-x 18
-y 19
-end
-arch biglake_nw
+arch sea
 name lake
 x 18
 y 19
@@ -4040,11 +4036,7 @@ name lake
 x 18
 y 22
 end
-arch grass
-x 18
-y 23
-end
-arch biglake_sw
+arch sea
 name lake
 x 18
 y 23
@@ -4237,11 +4229,7 @@ name Markku J{rvinen
 x 19
 y 18
 end
-arch grass
-x 19
-y 19
-end
-arch biglake_ne
+arch sea
 name lake
 x 19
 y 19
@@ -4261,11 +4249,7 @@ name lake
 x 19
 y 22
 end
-arch grass
-x 19
-y 23
-end
-arch biglake_se
+arch sea
 name lake
 x 19
 y 23
@@ -5304,9 +5288,9 @@ arch altar
 msg
 You feel watched.
 endmsg
+connected 1
 x 24
 y 21
-connected 1
 end
 arch grass
 x 24
@@ -5482,9 +5466,9 @@ x 25
 y 20
 end
 arch hedge_2_2_2
+no_pass 1
 x 25
 y 20
-no_pass 1
 end
 arch brush
 x 25
@@ -5492,19 +5476,19 @@ y 21
 end
 arch gate_closed_2
 face hedge_5.111
-x 25
-y 21
 speed 0.500000
 connected 1
+x 25
+y 21
 end
 arch brush
 x 25
 y 22
 end
 arch hedge_2_2_1
+no_pass 1
 x 25
 y 22
-no_pass 1
 end
 arch grass
 x 25
@@ -5695,9 +5679,9 @@ x 26
 y 20
 end
 arch hedge_2_1_2
+no_pass 1
 x 26
 y 20
-no_pass 1
 end
 arch magic_mouth
 msg
@@ -5719,9 +5703,9 @@ x 26
 y 22
 end
 arch hedge_2_1_2
+no_pass 1
 x 26
 y 22
-no_pass 1
 end
 arch grass
 x 26
@@ -5919,27 +5903,27 @@ x 27
 y 20
 end
 arch hedge_2_2_3
+no_pass 1
 x 27
 y 20
-no_pass 1
 end
 arch brush
 x 27
 y 21
 end
 arch hedge_2_1_1
+no_pass 1
 x 27
 y 21
-no_pass 1
 end
 arch brush
 x 27
 y 22
 end
 arch hedge_2_2_4
+no_pass 1
 x 27
 y 22
-no_pass 1
 end
 arch swall_1_1_half
 x 27