diff --git a/pup_land/nurnberg/apartment/main b/pup_land/nurnberg/apartment/main
index 4c4cf974e..0ce725266 100644
--- a/pup_land/nurnberg/apartment/main
+++ b/pup_land/nurnberg/apartment/main
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 1
 msg
 Created:  2000-11-19 Andreas Vogl (red.blaze@gmx.net)
-Modified: 2008-12-01 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -510,7 +510,7 @@ arch woodfloor
 x 5
 unique 1
 end
-arch stwall_2_2_2
+arch stwall_1_1
 x 5
 end
 arch woodfloor
@@ -621,7 +621,10 @@ arch woodfloor
 x 6
 unique 1
 end
-arch stwall_2_1_2
+arch oakdoor_2
+slaying /pup_land/nurnberg/city
+hp 10
+sp 21
 x 6
 end
 arch woodfloor
@@ -629,13 +632,6 @@ x 6
 y 1
 unique 1
 end
-arch oakdoor
-slaying /pup_land/nurnberg/city
-hp 10
-sp 21
-x 6
-y 1
-end
 arch woodfloor
 x 6
 y 2
@@ -744,7 +740,7 @@ arch woodfloor
 x 7
 unique 1
 end
-arch stwall_2_2_3
+arch stwall_1_1
 x 7
 end
 arch woodfloor
diff --git a/pup_land/nurnberg/city b/pup_land/nurnberg/city
index 117124309..9278e497f 100644
--- a/pup_land/nurnberg/city
+++ b/pup_land/nurnberg/city
@@ -8,7 +8,7 @@ msg
 Created:  1996-02-07
 Updated 2007.11.12 by Gene Alexander
  - make this an outdoor map for day/night/weather
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -219,7 +219,7 @@ end
 arch guild
 name Dungeon of Death
 slaying dick/hell
-hp 19
+hp 18
 sp 2
 x 1
 y 9
@@ -243,7 +243,7 @@ end
 arch guild
 name Dungeon of Life
 slaying dick/heaven
-hp 19
+hp 18
 sp 2
 x 1
 y 13
@@ -671,7 +671,7 @@ arch house_2
 name Bomb de Pon
 slaying dick/bomb1
 hp 16
-sp 18
+sp 19
 x 4
 y 9
 end
@@ -682,6 +682,7 @@ end
 arch house_2
 name ShowInv de Pon
 slaying dick/showinv
+hp 1
 sp 2
 x 4
 y 10
@@ -693,6 +694,7 @@ end
 arch house_2
 name Click de Pon
 slaying dick/click
+hp 1
 sp 14
 x 4
 y 11
@@ -1571,7 +1573,7 @@ arch keep
 name Headquarter of the Regular Army
 slaying hq
 hp 9
-sp 18
+sp 17
 x 9
 y 6
 end
diff --git a/pup_land/nurnberg/dick/bomb b/pup_land/nurnberg/dick/bomb
index 1360844dc..922fc1859 100644
--- a/pup_land/nurnberg/dick/bomb
+++ b/pup_land/nurnberg/dick/bomb
@@ -5,10 +5,10 @@ region nurnberg
 width 29
 height 25
 enter_x 16
-enter_y 24
+enter_y 23
 msg
 Created:  1996-02-10
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch igate_open_1
@@ -2757,7 +2757,7 @@ arch dungeon_floor
 x 16
 y 24
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../city
 hp 4
 sp 9
diff --git a/pup_land/nurnberg/dick/bomb1 b/pup_land/nurnberg/dick/bomb1
index 635b7f051..0469b1036 100644
--- a/pup_land/nurnberg/dick/bomb1
+++ b/pup_land/nurnberg/dick/bomb1
@@ -5,10 +5,10 @@ region nurnberg
 width 35
 height 32
 enter_x 16
-enter_y 18
+enter_y 19
 msg
 Created:  1996-12-25
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -2985,7 +2985,7 @@ arch dungeon_floor
 x 16
 y 18
 end
-arch oakdoor
+arch exit
 slaying ../city
 hp 4
 sp 9
diff --git a/pup_land/nurnberg/dick/click b/pup_land/nurnberg/dick/click
index b38b1f43c..7a78d49c0 100644
--- a/pup_land/nurnberg/dick/click
+++ b/pup_land/nurnberg/dick/click
@@ -4,10 +4,11 @@ difficulty 15
 region nurnberg
 width 29
 height 22
-enter_y 13
+enter_x 1
+enter_y 14
 msg
 Created:  1996-02-10
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -95,7 +96,7 @@ end
 arch woodfloor
 y 14
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../city
 hp 4
 sp 11
diff --git a/pup_land/nurnberg/dick/heaven b/pup_land/nurnberg/dick/heaven
index 594002d93..cab04d5ed 100644
--- a/pup_land/nurnberg/dick/heaven
+++ b/pup_land/nurnberg/dick/heaven
@@ -4,11 +4,11 @@ difficulty 25
 region nurnberg
 width 28
 height 32
-enter_x 19
+enter_x 18
 enter_y 2
 msg
 Created:  1996-02-12
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -6473,7 +6473,7 @@ arch woodfloor
 x 19
 y 2
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../city
 hp 2
 sp 14
diff --git a/pup_land/nurnberg/dick/hell b/pup_land/nurnberg/dick/hell
index 6c549827b..b1122c7f2 100644
--- a/pup_land/nurnberg/dick/hell
+++ b/pup_land/nurnberg/dick/hell
@@ -4,11 +4,11 @@ difficulty 25
 region nurnberg
 width 28
 height 32
-enter_x 19
+enter_x 18
 enter_y 2
 msg
 Created:  1996-02-12
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -6565,7 +6565,7 @@ arch woodfloor
 x 19
 y 2
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../city
 hp 2
 sp 10
diff --git a/pup_land/nurnberg/dick/showinv b/pup_land/nurnberg/dick/showinv
index e1a1827bb..f4fad04bd 100644
--- a/pup_land/nurnberg/dick/showinv
+++ b/pup_land/nurnberg/dick/showinv
@@ -4,10 +4,11 @@ difficulty 20
 region nurnberg
 width 35
 height 32
+enter_x 1
 enter_y 2
 msg
 Created:  1996-02-11
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch afloor_right
@@ -23,7 +24,7 @@ end
 arch afloor_right
 y 2
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../city
 hp 4
 sp 10
diff --git a/pup_land/nurnberg/dragonhangar/hangar b/pup_land/nurnberg/dragonhangar/hangar
index c98e4cb92..a9e4d8c0c 100644
--- a/pup_land/nurnberg/dragonhangar/hangar
+++ b/pup_land/nurnberg/dragonhangar/hangar
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 1
 msg
 Created:  1997-02-19
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch magic_banned
@@ -4674,7 +4674,7 @@ end
 arch cobblestones2
 x 14
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../city
 hp 26
 sp 22
@@ -4996,7 +4996,7 @@ end
 arch cobblestones2
 x 15
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../city
 hp 26
 sp 22
@@ -5343,7 +5343,7 @@ end
 arch cobblestones2
 x 16
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../city
 hp 26
 sp 22
@@ -5690,7 +5690,7 @@ end
 arch cobblestones2
 x 17
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../city
 hp 26
 sp 22
diff --git a/pup_land/nurnberg/hq b/pup_land/nurnberg/hq
index c07243e2d..d45b1da69 100644
--- a/pup_land/nurnberg/hq
+++ b/pup_land/nurnberg/hq
@@ -5,10 +5,10 @@ region nurnberg
 width 21
 height 19
 enter_x 9
-enter_y 18
+enter_y 17
 msg
 Created:  1996-04-03
-Modified: 2008-10-12 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -1372,7 +1372,7 @@ arch dungeon_floor
 x 9
 y 18
 end
-arch oakdoor
+arch oakdoor_2
 slaying city
 hp 10
 sp 7
diff --git a/pup_land/nurnberg/storehouse b/pup_land/nurnberg/storehouse
index e99c7dacd..dc9fa3995 100644
--- a/pup_land/nurnberg/storehouse
+++ b/pup_land/nurnberg/storehouse
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 32
 msg
 Created:  2000-12-25 Andreas Vogl (red.blaze@gmx.net)
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch grass
@@ -2979,7 +2979,7 @@ arch dirtfloor
 x 14
 y 33
 end
-arch oakdoor
+arch oakdoor_2
 slaying city
 hp 26
 sp 10
diff --git a/pup_land/port_e b/pup_land/port_e
index 1877d128d..a2977391a 100644
--- a/pup_land/port_e
+++ b/pup_land/port_e
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 13
 msg
 Created:  1996-01-29
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch sea
@@ -2397,7 +2397,7 @@ end
 arch house_2
 slaying port_e_house
 hp 7
-sp 15
+sp 14
 x 30
 y 7
 end
diff --git a/pup_land/port_e_house b/pup_land/port_e_house
index 030e7519d..c16643958 100644
--- a/pup_land/port_e_house
+++ b/pup_land/port_e_house
@@ -5,10 +5,10 @@ region pupland
 width 15
 height 16
 enter_x 7
-enter_y 15
+enter_y 14
 msg
 Created:  1996-01-29
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch sea
@@ -697,7 +697,7 @@ arch woodfloor
 x 7
 y 15
 end
-arch oakdoor
+arch oakdoor_2
 slaying port_e
 hp 30
 sp 7
diff --git a/pup_land/pplant/pplant1 b/pup_land/pplant/pplant1
index 33c298401..a70bcecf2 100644
--- a/pup_land/pplant/pplant1
+++ b/pup_land/pplant/pplant1
@@ -5,10 +5,10 @@ region pupland
 width 23
 height 23
 enter_x 10
-enter_y 22
+enter_y 21
 msg
 Created:  1996-02-04
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -1721,7 +1721,7 @@ arch cobblestones2
 x 10
 y 22
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../world
 hp 7
 sp 12
@@ -1870,7 +1870,7 @@ arch cobblestones2
 x 11
 y 22
 end
-arch oakdoor
+arch oakdoor_2
 slaying ../world
 hp 7
 sp 12
diff --git a/pup_land/raffle/raffle1 b/pup_land/raffle/raffle1
index ce1f0edf0..5e9c9a80f 100644
--- a/pup_land/raffle/raffle1
+++ b/pup_land/raffle/raffle1
@@ -7,11 +7,11 @@ difficulty 1
 region pupland
 width 18
 height 30
-enter_x 12
-enter_y 10
+enter_x 1
+enter_y 7
 msg
 Created:  1996-12-29
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -76,7 +76,7 @@ end
 arch cobblestones2
 y 7
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../terminal_u1
 hp 9
 sp 8
diff --git a/pup_land/raffle/raffle2 b/pup_land/raffle/raffle2
index 03c4fd279..4c404ce75 100644
--- a/pup_land/raffle/raffle2
+++ b/pup_land/raffle/raffle2
@@ -7,10 +7,11 @@ difficulty 1
 region pupland
 width 18
 height 30
+enter_x 1
 enter_y 7
 msg
 Created:  1996-12-29
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -60,7 +61,7 @@ end
 arch woodfloor
 y 7
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../terminal_u1
 hp 10
 sp 8
diff --git a/pup_land/raffle/raffle3 b/pup_land/raffle/raffle3
index 85f867634..67b873fc0 100644
--- a/pup_land/raffle/raffle3
+++ b/pup_land/raffle/raffle3
@@ -7,10 +7,11 @@ difficulty 1
 region pupland
 width 22
 height 30
+enter_x 1
 enter_y 7
 msg
 Created:  1996-12-29
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -90,7 +91,7 @@ end
 arch flagstone
 y 7
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../terminal_u1
 hp 11
 sp 8
@@ -6503,7 +6504,7 @@ arch flagstone
 x 21
 y 5
 end
-arch oakdoor
+arch oakdoor_1
 slaying ../terminal_u1
 hp 11
 sp 8
diff --git a/pup_land/s_f/st1 b/pup_land/s_f/st1
index d4bd51c24..bfd7a63de 100644
--- a/pup_land/s_f/st1
+++ b/pup_land/s_f/st1
@@ -8,7 +8,7 @@ enter_x 8
 enter_y 15
 msg
 Created:  1996-02-10
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch pstone_1
@@ -647,7 +647,7 @@ arch flagstone
 x 7
 y 16
 end
-arch awall_2_1_2
+arch awall_1_3
 x 7
 y 16
 end
@@ -744,19 +744,15 @@ arch flagstone
 x 8
 y 15
 end
-arch oakdoor
+arch flagstone
+x 8
+y 16
+end
+arch oakdoor_2
 slaying cave2
 hp 8
 sp 7
 x 8
-y 15
-end
-arch flagstone
-x 8
-y 16
-end
-arch awall_2_1_2
-x 8
 y 16
 end
 arch flagstone
@@ -829,7 +825,7 @@ arch flagstone
 x 9
 y 16
 end
-arch awall_2_1_2
+arch awall_1_4
 x 9
 y 16
 end
diff --git a/pup_land/s_f/st3 b/pup_land/s_f/st3
index f4506e95d..1a79f93dd 100644
--- a/pup_land/s_f/st3
+++ b/pup_land/s_f/st3
@@ -8,7 +8,7 @@ enter_x 8
 enter_y 10
 msg
 Created:  1996-02-12
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -1881,13 +1881,12 @@ arch pstone_1
 x 12
 y 12
 end
-arch oakdoor
+arch invis_exit
 slaying secret
 hp 11
 sp 11
 x 12
 y 12
-invisible 1
 end
 arch grass
 x 12
diff --git a/pup_land/terminal_u1 b/pup_land/terminal_u1
index 27c2224b6..23a9eb2f7 100644
--- a/pup_land/terminal_u1
+++ b/pup_land/terminal_u1
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 10
 msg
 Created:  1996-04-05
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch biglake_center
@@ -938,6 +938,7 @@ end
 arch tavern
 name raffle1(easy)
 slaying raffle/raffle1
+hp 1
 sp 7
 x 9
 y 8
@@ -1047,6 +1048,7 @@ end
 arch house_small
 name raffle2(middle)
 slaying raffle/raffle2
+hp 1
 sp 7
 x 10
 y 8
@@ -1171,6 +1173,7 @@ end
 arch minihouse
 name raffle3(hard)
 slaying raffle/raffle3
+hp 1
 sp 7
 x 11
 y 8
diff --git a/pup_land/world b/pup_land/world
index 8efa82e63..11f9ba758 100644
--- a/pup_land/world
+++ b/pup_land/world
@@ -10,7 +10,7 @@ msg
 Created:  1996-02-25
 Updated 2007.11.12 by Gene Alexander
  - made this an outdoor map
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -1072,7 +1072,7 @@ arch fort
 name Power Plant
 slaying pplant/pplant1
 hp 10
-sp 22
+sp 21
 x 6
 y 11
 end