diff --git a/wolfsburg/etern_rew b/wolfsburg/etern_rew
index fc9cdfc56..abb56be2e 100644
--- a/wolfsburg/etern_rew
+++ b/wolfsburg/etern_rew
@@ -1,11 +1,11 @@
 arch map
+name The Eternal Reward
+difficulty 1
 region wolfsburg
-name etern_rew
-msg
-endmsg
-hp 7
-sp 23
-y 24
+width 16
+height 24
+enter_x 7
+enter_y 23
 end
 arch woodfloor
 end
@@ -80,6 +80,9 @@ end
 arch woodfloor
 y 12
 end
+arch swall_1_4_half
+y 12
+end
 arch wwall_2_1_1
 y 12
 end
@@ -208,7 +211,7 @@ arch woodfloor
 x 1
 y 12
 end
-arch swall_1_4
+arch swall_2_1_2
 x 1
 y 12
 end
@@ -1023,7 +1026,7 @@ arch woodfloor
 x 6
 y 22
 end
-arch swall_1_2
+arch swall_2_1_1
 x 6
 y 22
 end
@@ -1031,6 +1034,10 @@ arch woodfloor
 x 6
 y 23
 end
+arch swall_1_2_half
+x 6
+y 23
+end
 arch wwall_1_3
 x 6
 y 23
@@ -1853,7 +1860,7 @@ arch letter
 name Instructions for Magic Shovel
 msg
 Us the shovel to break through the
-mountains and then stand where you 
+mountains and then stand where you
 think the treasure is and push 'A'
 endmsg
 x 13
@@ -1871,9 +1878,9 @@ I search the seven seas looking for
 treasure
 @match treasure
 Long John and I hid some treasure on
-an island and we buried it.  He locked 
+an island and we buried it.  He locked
 the map in his den and I have the
-instructions to use the magic shovel. 
+instructions to use the magic shovel.
 @match shovel|magic|magic shovel
 We had a magic shovel.  But we lost it
 on a distant island.
diff --git a/wolfsburg/inns b/wolfsburg/inns
index a7857ad49..79886dc26 100644
--- a/wolfsburg/inns
+++ b/wolfsburg/inns
@@ -1,8 +1,9 @@
 arch map
+name Wolfsburg Inn
+difficulty 1
 region wolfsburg
-msg
-endmsg
-x 30
+width 30
+height 16
 end
 arch woodfloor
 end
@@ -177,7 +178,7 @@ arch woodfloor
 x 1
 y 12
 end
-arch door_look_1
+arch wwall_1_3
 x 1
 y 12
 end
@@ -263,7 +264,7 @@ arch woodfloor
 x 2
 y 12
 end
-arch wwall_2_1_2
+arch door_look_1
 x 2
 y 12
 end
@@ -367,7 +368,7 @@ arch woodfloor
 x 3
 y 12
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 3
 y 12
 end
@@ -595,7 +596,7 @@ arch woodfloor
 x 6
 y 1
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 6
 y 1
 end
@@ -603,18 +604,18 @@ arch woodfloor
 x 6
 y 2
 end
-arch wwall_2_1_1
+arch door_look_2
 x 6
 y 2
+no_pass 0
 end
 arch woodfloor
 x 6
 y 3
 end
-arch door_look_2
+arch wwall_1_1
 x 6
 y 3
-no_pass 0
 end
 arch woodfloor
 x 6
@@ -628,7 +629,7 @@ arch woodfloor
 x 6
 y 5
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 6
 y 5
 end
@@ -653,7 +654,7 @@ arch woodfloor
 x 6
 y 8
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 6
 y 8
 end
@@ -2125,7 +2126,7 @@ arch woodfloor
 x 21
 y 4
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 21
 y 4
 end
@@ -2142,7 +2143,7 @@ arch woodfloor
 x 21
 y 6
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 21
 y 6
 end
@@ -2158,7 +2159,7 @@ arch woodfloor
 x 21
 y 8
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 21
 y 8
 end
@@ -2175,7 +2176,7 @@ arch woodfloor
 x 21
 y 10
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 21
 y 10
 end
@@ -2191,24 +2192,24 @@ arch woodfloor
 x 21
 y 12
 end
-arch door_look_2
+arch wwall_1_2
 x 21
 y 12
-no_pass 0
 end
 arch woodfloor
 x 21
 y 13
 end
-arch wwall_2_1_1
+arch door_look_2
 x 21
 y 13
+no_pass 0
 end
 arch woodfloor
 x 21
 y 14
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 21
 y 14
 end
@@ -2336,7 +2337,7 @@ arch woodfloor
 x 23
 y 8
 end
-arch wwall_2_1_1
+arch wwall_1_2
 x 23
 y 8
 end
@@ -2353,7 +2354,7 @@ arch woodfloor
 x 23
 y 10
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 23
 y 10
 end
@@ -2369,24 +2370,24 @@ arch woodfloor
 x 23
 y 12
 end
-arch door_look_2
+arch wwall_1_2
 x 23
 y 12
-no_pass 0
 end
 arch woodfloor
 x 23
 y 13
 end
-arch wwall_2_1_1
+arch door_look_2
 x 23
 y 13
+no_pass 0
 end
 arch woodfloor
 x 23
 y 14
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 23
 y 14
 end
diff --git a/wolfsburg/piratechurch b/wolfsburg/piratechurch
index b0c9a48e8..469509f11 100644
--- a/wolfsburg/piratechurch
+++ b/wolfsburg/piratechurch
@@ -1,10 +1,9 @@
 arch map
+name Run-down Church
+difficulty 1
 region wolfsburg
-name piratechurch
-msg
-endmsg
-x 11
-y 17
+width 11
+height 17
 end
 arch woodfloor
 end
@@ -121,7 +120,7 @@ name highlander
 msg
 @match *
 This is Holy Ground.  You cannot defile
-it with combat! 
+it with combat!
 endmsg
 hp 100
 x 1
@@ -181,93 +180,93 @@ arch woodfloor
 x 1
 y 13
 end
+arch wwall_1_3
+x 1
+y 13
+end
+arch woodfloor
+x 1
+y 14
+end
+arch pirate
+x 1
+y 14
+end
+arch woodfloor
+x 1
+y 15
+end
+arch pirate
+x 1
+y 15
+end
+arch woodfloor
+x 1
+y 16
+end
+arch wwall_2_1_2
+x 1
+y 16
+end
+arch woodfloor
+x 2
+end
+arch wwall_2_1_2
+x 2
+end
+arch woodfloor
+x 2
+y 1
+end
+arch woodfloor
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch woodfloor
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
 arch door_look_1
-x 1
-y 13
-end
-arch woodfloor
-x 1
-y 14
-end
-arch pirate
-x 1
-y 14
-end
-arch woodfloor
-x 1
-y 15
-end
-arch pirate
-x 1
-y 15
-end
-arch woodfloor
-x 1
-y 16
-end
-arch wwall_2_1_2
-x 1
-y 16
-end
-arch woodfloor
-x 2
-end
-arch wwall_2_1_2
-x 2
-end
-arch woodfloor
-x 2
-y 1
-end
-arch woodfloor
-x 2
-y 2
-end
-arch woodfloor
-x 2
-y 3
-end
-arch woodfloor
-x 2
-y 4
-end
-arch woodfloor
-x 2
-y 5
-end
-arch woodfloor
-x 2
-y 6
-end
-arch woodfloor
-x 2
-y 7
-end
-arch woodfloor
-x 2
-y 8
-end
-arch woodfloor
-x 2
-y 9
-end
-arch woodfloor
-x 2
-y 10
-end
-arch woodfloor
-x 2
-y 11
-end
-arch woodfloor
-x 2
-y 12
-end
-arch woodfloor
-x 2
-y 13
-end
-arch wwall_2_1_2
 x 2
 y 13
 end
@@ -385,7 +384,7 @@ arch woodfloor
 x 3
 y 13
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 3
 y 13
 end
@@ -798,7 +797,7 @@ arch woodfloor
 x 7
 y 13
 end
-arch wwall_2_1_2
+arch wwall_1_3
 x 7
 y 13
 end
@@ -884,93 +883,93 @@ arch woodfloor
 x 8
 y 13
 end
-arch wwall_2_1_2
-x 8
-y 13
-end
-arch woodfloor
-x 8
-y 14
-end
-arch pirate
-x 8
-y 14
-end
-arch woodfloor
-x 8
-y 15
-end
-arch pirate
-x 8
-y 15
-end
-arch woodfloor
-x 8
-y 16
-end
-arch wwall_2_1_2
-x 8
-y 16
-end
-arch woodfloor
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch woodfloor
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch woodfloor
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
-arch woodfloor
-x 9
-y 12
-end
-arch woodfloor
-x 9
-y 13
-end
 arch door_look_1
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch pirate
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
+arch pirate
+x 8
+y 15
+end
+arch woodfloor
+x 8
+y 16
+end
+arch wwall_2_1_2
+x 8
+y 16
+end
+arch woodfloor
+x 9
+end
+arch wwall_2_1_2
+x 9
+end
+arch woodfloor
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch wwall_1_4
 x 9
 y 13
 end
diff --git a/wolfsburg/prison b/wolfsburg/prison
index 7a919b5fb..563aa5f7b 100644
--- a/wolfsburg/prison
+++ b/wolfsburg/prison
@@ -1,11 +1,11 @@
 arch map
+name Wolfsburg Prison
+difficulty 1
 region wolfsburg
-msg
-endmsg
-hp 14
-sp 1
-x 30
-y 25
+width 30
+height 25
+enter_x 14
+enter_y 1
 end
 arch dungeon_floor
 end
diff --git a/wolfsburg/slave_pit1 b/wolfsburg/slave_pit1
index e5434fd8f..8d9a18b21 100644
--- a/wolfsburg/slave_pit1
+++ b/wolfsburg/slave_pit1
@@ -1,11 +1,11 @@
 arch map
+name Slave Pits
+difficulty 1
 region wolfsburg
-msg
-endmsg
-hp 1
-sp 1
-x 40
-y 40
+width 40
+height 40
+enter_x 1
+enter_y 1
 end
 arch dirtfloor
 end
diff --git a/wolfsburg/slave_pit2 b/wolfsburg/slave_pit2
index f2dca4506..03d652e80 100644
--- a/wolfsburg/slave_pit2
+++ b/wolfsburg/slave_pit2
@@ -1,10 +1,9 @@
 arch map
+name Slave Pits
+difficulty 1
 region wolfsburg
-name slave_pit2
-msg
-endmsg
-x 35
-y 25
+width 35
+height 25
 end
 arch blocked
 end
diff --git a/wolfsburg/slave_pit3 b/wolfsburg/slave_pit3
index a56ee128d..2ef8a93a9 100644
--- a/wolfsburg/slave_pit3
+++ b/wolfsburg/slave_pit3
@@ -1,11 +1,11 @@
 arch map
+name Slave Pits
+difficulty 1
 region wolfsburg
-msg
-endmsg
-hp 1
-sp 1
-x 30
-y 25
+width 30
+height 25
+enter_x 1
+enter_y 1
 end
 arch dungeon_floor
 end
diff --git a/wolfsburg/snakepit b/wolfsburg/snakepit
index 772b3d677..60436ab43 100644
--- a/wolfsburg/snakepit
+++ b/wolfsburg/snakepit
@@ -1,15 +1,16 @@
 arch map
+name Snakepit
+difficulty 1
 region wolfsburg
-name snakepit
+width 15
+height 15
+enter_x 13
+enter_y 1
 msg
 Creator: 
 Email: 
 Date: Wed Oct 13 12:33:52 1993
 endmsg
-hp 13
-sp 1
-x 15
-y 15
 end
 arch medium_stones
 end
diff --git a/wolfsburg/ware1 b/wolfsburg/ware1
index 30e147ec1..d4d3c53db 100644
--- a/wolfsburg/ware1
+++ b/wolfsburg/ware1
@@ -1,11 +1,11 @@
 arch map
+name Warehouse
+difficulty 1
 region wolfsburg
-msg
-endmsg
-hp 1
-sp 1
-x 35
-y 35
+width 35
+height 35
+enter_x 1
+enter_y 1
 end
 arch woodfloor
 end
diff --git a/wolfsburg/whorehouse b/wolfsburg/whorehouse
index 1a3cc8e5f..ad5b9fb48 100644
--- a/wolfsburg/whorehouse
+++ b/wolfsburg/whorehouse
@@ -1,10 +1,10 @@
 arch map
+name The Red Light District
+difficulty 1
 region wolfsburg
-msg
-endmsg
-hp 1
-x 20
-y 20
+width 20
+height 20
+enter_x 1
 end
 arch woodfloor
 end
diff --git a/world/world_128_109 b/world/world_128_109
index 4cdf26418..8949d0123 100644
--- a/world/world_128_109
+++ b/world/world_128_109
@@ -7751,7 +7751,7 @@ x 32
 y 11
 end
 arch oakdoor
-name slave pits
+name Slave Pits
 slaying /wolfsburg/slave_pit1
 face gwall_0.111
 hp 1
@@ -8003,7 +8003,7 @@ x 33
 y 11
 end
 arch oakdoor
-name slave pits
+name Slave Pits
 slaying /wolfsburg/slave_pit2
 face gwall_0.111
 hp 2
@@ -8255,7 +8255,7 @@ x 34
 y 11
 end
 arch oakdoor
-name slave pits
+name Slave Pits
 slaying /wolfsburg/slave_pit3
 face gwall_0.111
 hp 1
@@ -12379,8 +12379,7 @@ x 40
 y 1
 end
 arch church
-name run-down church
-name_pl run-down church
+name Run-down Church
 slaying /wolfsburg/piratechurch
 hp 5
 sp 14