diff --git a/port_joseph/town/house b/port_joseph/town/house
index 55fa684c1..9307b97e1 100644
--- a/port_joseph/town/house
+++ b/port_joseph/town/house
@@ -2,118 +2,239 @@ arch map
 name Gren's House
 difficulty 4
 region portjoseph
-width 10
-height 10
+width 14
+height 14
 enter_x 7
 enter_y 8
 msg
 Created:  2007-05-26 Nicolas Weeger
-Modified: 2008-10-21 Rick Tanner
+Modified: 2011-11-24 Rick Tanner
 endmsg
 maplore
 @quest Lursendis
 Entrance to an underground tavern.
 endmaplore
+outdoor 1
+end
+arch pstone_1
+end
+arch pstone_1
+y 1
+end
+arch pstone_1
+y 2
+end
+arch pstone_1
+y 3
+end
+arch pstone_1
+y 4
+end
+arch pstone_1
+y 5
+end
+arch pstone_1
+y 6
+end
+arch pstone_1
+y 7
+end
+arch pstone_1
+y 8
+end
+arch pstone_1
+y 9
+end
+arch pstone_1
+y 10
+end
+arch pstone_1
+y 11
+end
+arch pstone_1
+y 12
+end
+arch pstone_1
+y 13
+end
+arch cobblestones2
+x 1
+end
+arch grass_only
+x 1
+y 1
+end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch cobblestones2
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch woodfloor
+x 2
+y 2
 end
 arch cwall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch cwall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch cwall_2_1_1
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
+arch cwall_2_1_1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch cwall_2_1_1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
 arch cwall_3_2
-y 3
-end
-arch woodfloor
-y 4
-end
-arch cwall_2_1_1
-y 4
-end
-arch woodfloor
-y 5
-end
-arch cwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor
+x 2
 y 6
 end
-arch cwall_2_1_1
+arch dwall_win1
+x 2
 y 6
 end
 arch woodfloor
+x 2
 y 7
 end
 arch cwall_2_1_1
+x 2
 y 7
 end
 arch woodfloor
+x 2
 y 8
 end
 arch cwall_2_1_1
+x 2
 y 8
 end
 arch woodfloor
+x 2
 y 9
 end
+arch dwall_win1
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch cwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
 arch cwall_2_2_1
-y 9
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch grass_only
+x 2
+y 13
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch woodfloor
-x 1
+x 3
+y 2
 end
 arch cwall_2_1_2
-x 1
+x 3
+y 2
 end
 arch woodfloor
-x 1
-y 1
+x 3
+y 3
 end
 arch stair2_down
 slaying underground_tavern
 hp 1
 sp 1
-x 1
-y 1
-end
-arch woodfloor
-x 1
-y 2
-end
-arch magic_ear
-msg
-@match tavern|inn
-Click.
-endmsg
-x 1
-y 3
-connected 1
-end
-arch woodfloor
-x 1
+x 3
 y 3
 end
-arch cwall_closed_1
-x 1
-y 3
-connected 1
-end
 arch woodfloor
-x 1
+x 3
 y 4
 end
 arch magic_ear
@@ -121,14 +242,36 @@ msg
 @match tavern|inn
 Click.
 endmsg
-x 1
+x 3
 y 5
 connected 1
 end
 arch woodfloor
-x 1
+x 3
 y 5
 end
+arch cwall_closed_1
+x 3
+y 5
+connected 1
+end
+arch woodfloor
+x 3
+y 6
+end
+arch magic_ear
+msg
+@match tavern|inn
+Click.
+endmsg
+x 3
+y 7
+connected 1
+end
+arch woodfloor
+x 3
+y 7
+end
 arch man2
 name Gren
 msg
@@ -137,519 +280,851 @@ Oh, of course, be my guest and enjoy!
 @match *
 Hello, is there any reason you're in my house?
 endmsg
-x 1
-y 5
+x 3
+y 7
 stand_still 1
 end
 arch woodfloor
-x 1
-y 6
+x 3
+y 8
 end
 arch woodfloor
-x 1
-y 7
+x 3
+y 9
 end
 arch chair_1.1
-x 1
-y 7
+x 3
+y 9
 no_pick 1
 end
 arch woodfloor
-x 1
-y 8
+x 3
+y 10
 end
 arch table_3
-x 1
-y 8
+x 3
+y 10
 no_pick 1
 end
+arch light2
+x 3
+y 11
+end
 arch woodfloor
-x 1
-y 9
+x 3
+y 11
 end
 arch dwall_win2
-x 1
-y 9
+x 3
+y 11
 end
-arch woodfloor
-x 2
+arch grass_only
+x 3
+y 12
 end
-arch cwall_2_1_2
-x 2
+arch grass_only
+x 3
+y 13
 end
-arch woodfloor
-x 2
+arch cobblestones2
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
 arch woodfloor
-x 2
+x 4
 y 2
 end
-arch woodfloor
-x 2
-y 3
-end
 arch cwall_2_1_2
-x 2
+x 4
+y 2
+end
+arch light2
+x 4
 y 3
 end
 arch woodfloor
-x 2
+x 4
+y 3
+end
+arch woodfloor
+x 4
 y 4
 end
 arch woodfloor
-x 2
+x 4
+y 5
+end
+arch cwall_2_1_2
+x 4
 y 5
 end
 arch woodfloor
-x 2
+x 4
 y 6
 end
-arch woodfloor
-x 2
+arch light4
+x 4
 y 7
 end
 arch woodfloor
-x 2
+x 4
+y 7
+end
+arch woodfloor
+x 4
 y 8
 end
 arch woodfloor
-x 2
-y 9
-end
-arch cwall_2_1_2
-x 2
+x 4
 y 9
 end
 arch woodfloor
-x 3
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch cwall_2_1_2
+x 4
+y 11
+end
+arch grass_only
+x 4
+y 12
+end
+arch grass_only
+x 4
+y 13
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
 end
 arch cwall_3_3
-x 3
-end
-arch woodfloor
-x 3
-y 1
-end
-arch cwall_2_1_1
-x 3
-y 1
-end
-arch woodfloor
-x 3
-y 2
-end
-arch cwall_2_1_1
-x 3
+x 5
 y 2
 end
 arch woodfloor
-x 3
+x 5
 y 3
 end
-arch cwall_3_1
-x 3
+arch cwall_2_1_1
+x 5
 y 3
 end
 arch woodfloor
-x 3
+x 5
+y 4
+end
+arch cwall_2_1_1
+x 5
 y 4
 end
 arch woodfloor
-x 3
+x 5
+y 5
+end
+arch cwall_3_1
+x 5
 y 5
 end
 arch woodfloor
-x 3
+x 5
 y 6
 end
 arch woodfloor
-x 3
+x 5
 y 7
 end
 arch woodfloor
-x 3
+x 5
 y 8
 end
 arch woodfloor
-x 3
-y 9
-end
-arch cwall_2_1_2
-x 3
+x 5
 y 9
 end
 arch woodfloor
-x 4
-end
-arch cwall_2_1_2
-x 4
+x 5
+y 10
 end
 arch woodfloor
-x 4
+x 5
+y 11
+end
+arch cwall_2_1_2
+x 5
+y 11
+end
+arch grass_only
+x 5
+y 12
+end
+arch grass_only
+x 5
+y 13
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
 y 1
 end
+arch woodfloor
+x 6
+y 2
+end
+arch cwall_2_1_2
+x 6
+y 2
+end
+arch light4
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 3
+end
 arch stove
-x 4
-y 1
+x 6
+y 3
 is_cauldron 0
 end
 arch woodfloor
-x 4
-y 2
-end
-arch woodfloor
-x 4
-y 3
-end
-arch cwall_2_1_2
-x 4
-y 3
-end
-arch woodfloor
-x 4
+x 6
 y 4
 end
 arch woodfloor
-x 4
+x 6
 y 5
 end
+arch cwall_2_1_2
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
 arch cwall_1_4
-x 4
-y 5
-end
-arch woodfloor
-x 4
-y 6
-end
-arch bookshelf
-x 4
-y 6
-no_pick 1
-end
-arch woodfloor
-x 4
+x 6
 y 7
 end
 arch woodfloor
-x 4
+x 6
 y 8
 end
+arch bookshelf
+x 6
+y 8
+no_pick 1
+end
 arch woodfloor
-x 4
+x 6
 y 9
 end
+arch woodfloor
+x 6
+y 10
+end
+arch light2
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 11
+end
 arch dwall_win2
-x 4
-y 9
+x 6
+y 11
 end
-arch woodfloor
-x 5
+arch grass_only
+x 6
+y 12
 end
-arch cwall_2_1_2
-x 5
+arch grass_only
+x 6
+y 13
 end
-arch woodfloor
-x 5
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
 arch woodfloor
-x 5
+x 7
+y 2
+end
+arch cwall_2_1_2
+x 7
 y 2
 end
 arch woodfloor
-x 5
-y 3
-end
-arch cwall_1_3
-x 5
+x 7
 y 3
 end
 arch woodfloor
-x 5
+x 7
 y 4
 end
 arch woodfloor
-x 5
+x 7
 y 5
 end
-arch cwall_2_1_2
-x 5
+arch cwall_1_3
+x 7
 y 5
 end
 arch woodfloor
-x 5
+x 7
 y 6
 end
+arch woodfloor
+x 7
+y 7
+end
+arch cwall_2_1_2
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
 arch bookshelf
-x 5
-y 6
+x 7
+y 8
 no_pick 1
 end
 arch woodfloor
-x 5
-y 7
+x 7
+y 9
 end
 arch woodfloor
-x 5
-y 8
+x 7
+y 10
 end
 arch bed_1
-x 5
-y 8
+x 7
+y 10
 end
 arch woodfloor
-x 5
-y 9
+x 7
+y 11
 end
 arch cwall_2_1_2
-x 5
-y 9
+x 7
+y 11
 end
-arch woodfloor
-x 6
+arch grass_only
+x 7
+y 12
 end
-arch cwall_2_1_2
-x 6
+arch grass_only
+x 7
+y 13
 end
-arch woodfloor
-x 6
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
 arch woodfloor
-x 6
+x 8
+y 2
+end
+arch dwall_win2
+x 8
 y 2
 end
 arch woodfloor
-x 6
+x 8
 y 3
 end
 arch woodfloor
-x 6
+x 8
 y 4
 end
 arch woodfloor
-x 6
+x 8
 y 5
 end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
 arch cwall_2_2_3
-x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch cwall_2_1_1
-x 6
-y 6
-end
-arch woodfloor
-x 6
-y 7
-end
-arch cwall_2_1_1
-x 6
+x 8
 y 7
 end
 arch woodfloor
-x 6
+x 8
 y 8
 end
 arch cwall_2_1_1
-x 6
+x 8
 y 8
 end
 arch woodfloor
-x 6
+x 8
 y 9
 end
+arch cwall_2_1_1
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch cwall_2_1_1
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
 arch cwall_2_2_4
-x 6
-y 9
+x 8
+y 11
 end
-arch woodfloor
-x 7
-end
-arch cwall_2_1_2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch woodfloor
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch cwall_1_4
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
+arch dungeon_magic
+x 8
+y 12
 end
 arch exit
 slaying /world/world_101_114
 hp 12
 sp 35
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 9
-end
-arch woodfloor
 x 8
+y 12
 end
-arch cwall_2_1_2
+arch grass_only
 x 8
+y 12
 end
-arch woodfloor
+arch grass_only
 x 8
+y 13
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
 arch woodfloor
-x 8
+x 9
+y 2
+end
+arch cwall_2_1_2
+x 9
 y 2
 end
 arch woodfloor
-x 8
-y 3
-end
-arch cwall_2_1_2
-x 8
+x 9
 y 3
 end
 arch woodfloor
-x 8
-y 4
-end
-arch fireplace
-x 8
+x 9
 y 4
 end
 arch woodfloor
-x 8
+x 9
 y 5
 end
-arch woodfloor
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch woodfloor
-x 8
-y 8
-end
-arch woodfloor
-x 8
-y 9
-end
 arch cwall_1_4
-x 8
-y 9
+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 button_small
+x 9
+y 10
+connected 2
+end
+arch woodfloor
+x 9
+y 10
+end
+arch button_small
+x 9
+y 11
+connected 2
+end
+arch woodfloor
+x 9
+y 11
+end
+arch odoorn2_closed_1
+x 9
+y 11
+connected 2
+end
+arch dungeon_magic
+x 9
+y 12
+end
+arch exit
+slaying /world/world_101_114
+hp 12
+sp 35
+x 9
+y 12
+end
+arch grass_only
+x 9
+y 12
+end
+arch grass_only
+x 9
+y 13
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch cwall_2_1_2
+x 10
+y 2
+end
+arch light4
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch cwall_2_1_2
+x 10
+y 5
+end
+arch light4
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 6
+end
+arch fireplace
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch light4
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 9
+end
+arch button_small
+x 10
+y 10
+connected 2
+end
+arch woodfloor
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch cwall_1_4
+x 10
+y 11
+end
+arch dungeon_magic
+x 10
+y 12
+end
+arch exit
+slaying /world/world_101_114
+hp 12
+sp 35
+x 10
+y 12
+end
+arch grass_only
+x 10
+y 12
+end
+arch grass_only
+x 10
+y 13
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch woodfloor
+x 11
+y 2
 end
 arch cwall_2_2_3
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch cwall_2_1_1
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch cwall_2_1_1
-x 9
+x 11
 y 2
 end
 arch woodfloor
-x 9
+x 11
 y 3
 end
+arch dwall_win1
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch cwall_2_1_1
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
 arch cwall_3_4
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
-arch cwall_2_1_1
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch cwall_2_1_1
-x 9
+x 11
 y 5
 end
 arch woodfloor
-x 9
+x 11
 y 6
 end
 arch cwall_2_1_1
-x 9
+x 11
 y 6
 end
 arch woodfloor
-x 9
+x 11
 y 7
 end
 arch cwall_2_1_1
-x 9
+x 11
 y 7
 end
 arch woodfloor
-x 9
+x 11
 y 8
 end
-arch cwall_2_1_1
-x 9
+arch dwall_win1
+x 11
 y 8
 end
 arch woodfloor
-x 9
+x 11
 y 9
 end
+arch cwall_2_1_1
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch cwall_2_1_1
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
 arch cwall_2_2_4
-x 9
+x 11
+y 11
+end
+arch grass_only
+x 11
+y 12
+end
+arch grass_only
+x 11
+y 13
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch grass_only
+x 12
+y 2
+end
+arch grass_only
+x 12
+y 3
+end
+arch grass_only
+x 12
+y 4
+end
+arch grass_only
+x 12
+y 5
+end
+arch grass_only
+x 12
+y 6
+end
+arch grass_only
+x 12
+y 7
+end
+arch grass_only
+x 12
+y 8
+end
+arch grass_only
+x 12
 y 9
 end
+arch grass_only
+x 12
+y 10
+end
+arch grass_only
+x 12
+y 11
+end
+arch grass_only
+x 12
+y 12
+end
+arch grass_only
+x 12
+y 13
+end
+arch cobblestones2
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch grass_only
+x 13
+y 2
+end
+arch grass_only
+x 13
+y 3
+end
+arch grass_only
+x 13
+y 4
+end
+arch grass_only
+x 13
+y 5
+end
+arch grass_only
+x 13
+y 6
+end
+arch grass_only
+x 13
+y 7
+end
+arch grass_only
+x 13
+y 8
+end
+arch grass_only
+x 13
+y 9
+end
+arch grass_only
+x 13
+y 10
+end
+arch grass_only
+x 13
+y 11
+end
+arch grass_only
+x 13
+y 12
+end
+arch grass_only
+x 13
+y 13
+end
diff --git a/port_joseph/town/underground_tavern b/port_joseph/town/underground_tavern
index d2b555dfa..6f8c99df9 100644
--- a/port_joseph/town/underground_tavern
+++ b/port_joseph/town/underground_tavern
@@ -11,7 +11,7 @@ msg
 This tavern seems quite old, but is apparently much used.
 
 Created:  2007-05-26 Nicolas Weeger
-Modified: 2011-04-20 Nicolas Weeger
+Modified: 2011-11-24 Rick Tanner
 endmsg
 maplore
 @quest Lursendis
@@ -88,8 +88,8 @@ y 1
 end
 arch stair_3_up
 slaying house
-hp 1
-sp 1
+hp 3
+sp 3
 x 1
 y 1
 end