diff --git a/scorn/misc/cityhall b/scorn/misc/cityhall
index 64619c9b9..58dde1d57 100644
--- a/scorn/misc/cityhall
+++ b/scorn/misc/cityhall
@@ -9,6 +9,7 @@ enter_x 13
 enter_y 25
 msg
 Created:  1993-10-15
+Modified: 2007-12-10 Kevin Bulgrien
 endmsg
 end
 arch woods_2
@@ -28,7 +29,7 @@ end
 arch grass
 y 5
 end
-arch woodfloor
+arch grass
 y 6
 end
 arch mine10
@@ -210,10 +211,6 @@ arch mine7
 x 1
 y 6
 end
-arch woodfloor
-x 1
-y 7
-end
 arch dungeon_magic
 x 1
 y 7
@@ -234,10 +231,6 @@ arch woodfloor
 x 1
 y 8
 end
-arch woodfloor
-x 1
-y 9
-end
 arch dungeon_magic
 x 1
 y 9
@@ -250,10 +243,6 @@ arch chair_2.1
 x 1
 y 9
 end
-arch woodfloor
-x 1
-y 10
-end
 arch dungeon_magic
 x 1
 y 10
@@ -266,10 +255,6 @@ arch chair_2.1
 x 1
 y 10
 end
-arch woodfloor
-x 1
-y 11
-end
 arch dungeon_magic
 x 1
 y 11
@@ -282,10 +267,6 @@ arch chair_2.1
 x 1
 y 11
 end
-arch woodfloor
-x 1
-y 12
-end
 arch dungeon_magic
 x 1
 y 12
@@ -298,10 +279,6 @@ arch chair_2.1
 x 1
 y 12
 end
-arch woodfloor
-x 1
-y 13
-end
 arch dungeon_magic
 x 1
 y 13
@@ -573,7 +550,7 @@ end
 arch woods_2
 x 3
 end
-arch dungeon_floor
+arch woods
 x 3
 y 1
 end
@@ -669,10 +646,6 @@ arch chair_2.1
 x 3
 y 10
 end
-arch woodfloor
-x 3
-y 11
-end
 arch dungeon_magic
 x 3
 y 11
@@ -685,10 +658,6 @@ arch chair_2.1
 x 3
 y 11
 end
-arch woodfloor
-x 3
-y 12
-end
 arch dungeon_magic
 x 3
 y 12
@@ -701,10 +670,6 @@ arch chair_2.1
 x 3
 y 12
 end
-arch woodfloor
-x 3
-y 13
-end
 arch dungeon_magic
 x 3
 y 13
@@ -801,7 +766,7 @@ arch cobblestones
 x 3
 y 31
 end
-arch dungeon_floor
+arch woods
 x 4
 end
 arch mine10
@@ -1103,10 +1068,6 @@ arch chair_2.1
 x 5
 y 10
 end
-arch woodfloor
-x 5
-y 11
-end
 arch dungeon_magic
 x 5
 y 11
@@ -1119,10 +1080,6 @@ arch chair_2.1
 x 5
 y 11
 end
-arch woodfloor
-x 5
-y 12
-end
 arch dungeon_magic
 x 5
 y 12
@@ -1135,10 +1092,6 @@ arch chair_2.1
 x 5
 y 12
 end
-arch woodfloor
-x 5
-y 13
-end
 arch dungeon_magic
 x 5
 y 13
@@ -1544,10 +1497,6 @@ arch chair_2.1
 x 7
 y 10
 end
-arch woodfloor
-x 7
-y 11
-end
 arch dungeon_magic
 x 7
 y 11
@@ -1560,10 +1509,6 @@ arch chair_2.1
 x 7
 y 11
 end
-arch woodfloor
-x 7
-y 12
-end
 arch dungeon_magic
 x 7
 y 12
@@ -1576,10 +1521,6 @@ arch chair_2.1
 x 7
 y 12
 end
-arch woodfloor
-x 7
-y 13
-end
 arch dungeon_magic
 x 7
 y 13
@@ -1909,7 +1850,7 @@ arch dungeon_floor
 x 9
 y 1
 end
-arch mine4
+arch mine_1_2
 x 9
 y 1
 end
@@ -1993,10 +1934,6 @@ arch table
 x 9
 y 10
 end
-arch woodfloor
-x 9
-y 11
-end
 arch dungeon_magic
 x 9
 y 11
@@ -2005,13 +1942,28 @@ arch woodfloor
 x 9
 y 11
 end
-arch table
+arch dresser2
+name desk
+name_pl desks
 x 9
 y 11
+arch note
+name Proverbs
+name_pl Proverbs
+title of the Servant
+msg
+A feast fit for a king gains a valued prize.
+Royal service begets honor, title, and gifts.
+A royal title profers respect and freedom.
+A noble citizen neither hungers nor thirsts.
+Generous supplication yields bountiful grace.
+Lifelong and diligent veneration is greatly rewarded.
+The heretic is to be pitied for holy chastisement is harsh.
+endmsg
+level 1
+value 10
+weight 10
 end
-arch woodfloor
-x 9
-y 12
 end
 arch dungeon_magic
 x 9
@@ -2025,10 +1977,6 @@ arch table
 x 9
 y 12
 end
-arch woodfloor
-x 9
-y 13
-end
 arch dungeon_magic
 x 9
 y 13
@@ -2132,7 +2080,7 @@ arch dungeon_floor
 x 10
 y 1
 end
-arch mine2
+arch swall_2_1_2
 x 10
 y 1
 end
@@ -2228,10 +2176,6 @@ arch woodfloor
 x 10
 y 10
 end
-arch woodfloor
-x 10
-y 11
-end
 arch dungeon_magic
 x 10
 y 11
@@ -2252,10 +2196,6 @@ arch woodfloor
 x 10
 y 12
 end
-arch woodfloor
-x 10
-y 13
-end
 arch dungeon_magic
 x 10
 y 13
@@ -2373,7 +2313,7 @@ arch cobblestones
 x 10
 y 31
 end
-arch dungeon_floor
+arch woods
 x 11
 end
 arch mine10
@@ -2383,7 +2323,7 @@ arch dungeon_floor
 x 11
 y 1
 end
-arch mine12
+arch mine_1_2
 x 11
 y 1
 end
@@ -2496,7 +2436,7 @@ arch mine8
 x 11
 y 13
 end
-arch woodfloor
+arch cobblestones2
 x 11
 y 14
 end
@@ -3366,7 +3306,7 @@ arch dungeon_floor
 x 16
 y 1
 end
-arch mine4
+arch mine_1_2
 x 16
 y 1
 end
@@ -3439,10 +3379,6 @@ arch dungeon_floor
 x 16
 y 9
 end
-arch woodfloor
-x 16
-y 9
-end
 arch mine3
 x 16
 y 9
@@ -3570,7 +3506,7 @@ arch dungeon_floor
 x 17
 y 1
 end
-arch mine2
+arch swall_2_1_2
 x 17
 y 1
 end
@@ -3637,20 +3573,11 @@ end
 arch book_read
 name History of Crossfire
 msg
-Frank Tore Johansen started writing
-Crossfire in march 1992.  Since then
-several people throughout the world
-have contributed with source, maps
-and graphics.
-The earlier versions looked a lot
-like the game Gauntlet.  Then it
-started adopting the features of
-Nethack and Moria.
-Now it is moving in the direction
-of more complex games like Ultima.
-But during all those years, Crossfire
-has developed it's very own unique
-style.
+Frank Tore Johansen started writing Crossfire in March, 1992.
+Since then, many people throughout the world have contributed source code, maps, graphics, and other forms of support.
+Early versions of Crossfire looked much like early renditions of the game Gauntlet.  Since then, features like that of Nethack and Moria were adopted.
+Presently development is moving in the direction of producing a more complex game similar to Ultima.
+Throughout the years though, Crossfire continues to maintain it's very own distinctive style.
 endmsg
 x 17
 y 8
@@ -3875,7 +3802,7 @@ arch cobblestones
 x 17
 y 31
 end
-arch dungeon_floor
+arch woods
 x 18
 end
 arch mine10
@@ -3885,7 +3812,7 @@ arch dungeon_floor
 x 18
 y 1
 end
-arch mine12
+arch mine_1_2
 x 18
 y 1
 end
@@ -5839,7 +5766,7 @@ arch mine3
 x 27
 y 13
 end
-arch woodfloor
+arch grass
 x 27
 y 14
 end