diff --git a/navar_city/misc/kitchen b/navar_city/misc/kitchen
index 7afedf01b..a62e95b6b 100644
--- a/navar_city/misc/kitchen
+++ b/navar_city/misc/kitchen
@@ -2,288 +2,289 @@ arch map
 name Rosco's Kitchen
 difficulty 1
 region navar
-width 12
-height 12
+width 16
+height 16
 enter_x 4
 enter_y 11
 msg
 Created:  2004-02-21 Avion
-Modified: 2008-12-02 Rick Tanner
+Modified: 2011-11-16 Rick Tanner
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+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 grass_only
+x 1
+y 14
+end
+arch cobblestones2
+x 1
+y 15
+end
+arch cobblestones2
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch woodfloor2
+x 2
+y 2
 end
 arch wwall_2_2_2
-end
-arch woodfloor2
-y 1
-end
-arch wwall_2_1_1
-y 1
-end
-arch woodfloor2
-y 2
-end
-arch wwall_2_1_1
+x 2
 y 2
 end
 arch woodfloor2
+x 2
 y 3
 end
 arch wwall_2_1_1
+x 2
 y 3
 end
 arch woodfloor2
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
 arch woodfloor2
+x 2
 y 5
 end
 arch wwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor2
+x 2
 y 6
 end
 arch wwall_2_1_1
+x 2
 y 6
 end
 arch woodfloor2
+x 2
 y 7
 end
 arch wwall_2_1_1
+x 2
 y 7
 end
 arch woodfloor2
+x 2
 y 8
 end
 arch wwall_2_1_1
+x 2
 y 8
 end
 arch woodfloor2
+x 2
 y 9
 end
 arch wwall_2_1_1
+x 2
 y 9
 end
 arch woodfloor2
+x 2
 y 10
 end
 arch wwall_2_1_1
+x 2
 y 10
 end
 arch woodfloor2
+x 2
 y 11
 end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch woodfloor2
+x 2
+y 12
+end
+arch wwall_2_1_1
+x 2
+y 12
+end
+arch woodfloor2
+x 2
+y 13
+end
 arch wwall_2_2_1
-y 11
+x 2
+y 13
+end
+arch grass_only
+x 2
+y 14
+end
+arch cobblestones2
+x 2
+y 15
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch woodfloor2
-x 1
+x 3
+y 2
 end
 arch wwall_2_1_2
-x 1
-end
-arch woodfloor2
-x 1
-y 1
-end
-arch chair_1.4
-x 1
-y 1
-end
-arch woodfloor2
-x 1
-y 2
-end
-arch chair_1.4
-x 1
+x 3
 y 2
 end
 arch woodfloor2
-x 1
+x 3
 y 3
 end
 arch chair_1.4
-x 1
+x 3
 y 3
 end
 arch woodfloor2
-x 1
+x 3
 y 4
 end
 arch chair_1.4
-x 1
+x 3
 y 4
 end
 arch woodfloor2
-x 1
+x 3
 y 5
 end
 arch chair_1.4
-x 1
+x 3
 y 5
 end
 arch woodfloor2
-x 1
+x 3
+y 6
+end
+arch chair_1.4
+x 3
 y 6
 end
 arch woodfloor2
-x 1
+x 3
 y 7
 end
-arch woodfloor2
-x 1
-y 8
-end
-arch woodfloor2
-x 1
-y 9
-end
-arch woodfloor2
-x 1
-y 10
-end
-arch woodfloor2
-x 1
-y 11
-end
-arch wwall_2_1_2
-x 1
-y 11
-end
-arch woodfloor2
-x 2
-end
-arch wwall_2_1_2
-x 2
-end
-arch woodfloor2
-x 2
-y 1
-end
-arch table_4
-x 2
-y 1
-end
-arch woodfloor2
-x 2
-y 2
-end
-arch table_4
-x 2
-y 2
-end
-arch woodfloor2
-x 2
-y 3
-end
-arch table_4
-x 2
-y 3
-end
-arch woodfloor2
-x 2
-y 4
-end
-arch table_4
-x 2
-y 4
-end
-arch woodfloor2
-x 2
-y 5
-end
-arch table_4
-x 2
-y 5
-end
-arch woodfloor2
-x 2
-y 6
-end
-arch wwall_0
-x 2
-y 6
-end
-arch woodfloor2
-x 2
-y 7
-end
-arch woodfloor2
-x 2
-y 8
-end
-arch woodfloor2
-x 2
-y 9
-end
-arch woodfloor2
-x 2
-y 10
-end
-arch woodfloor2
-x 2
-y 11
-end
-arch wwall_2_1_2
-x 2
-y 11
-end
-arch woodfloor2
-x 3
-end
-arch wwall_2_1_2
-x 3
-end
-arch woodfloor2
-x 3
-y 1
-end
-arch chair_1.2
-x 3
-y 1
-end
-arch woodfloor2
-x 3
-y 2
-end
-arch chair_1.2
-x 3
-y 2
-end
-arch woodfloor2
-x 3
-y 3
-end
-arch chair_1.2
-x 3
-y 3
-end
-arch woodfloor2
-x 3
-y 4
-end
-arch chair_1.2
-x 3
-y 4
-end
-arch woodfloor2
-x 3
-y 5
-end
-arch chair_1.2
-x 3
-y 5
-end
-arch woodfloor2
-x 3
-y 6
-end
-arch woodfloor2
+arch chair_1.4
 x 3
 y 7
 end
@@ -303,21 +304,46 @@ arch woodfloor2
 x 3
 y 11
 end
+arch button_small
+x 3
+y 12
+connected 1
+end
 arch woodfloor2
 x 3
-y 11
+y 12
+end
+arch woodfloor2
+x 3
+y 13
 end
 arch wwall_1_3
 x 3
-y 11
+y 13
 end
-arch woodfloor2
+arch dungeon_magic
+x 3
+y 14
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 0
+sp 7
+x 3
+y 14
+end
+arch grass_only
+x 3
+y 14
+end
+arch cobblestones2
+x 3
+y 15
+end
+arch cobblestones2
 x 4
 end
-arch wwall_2_1_2
-x 4
-end
-arch woodfloor2
+arch grass_only
 x 4
 y 1
 end
@@ -325,30 +351,66 @@ arch woodfloor2
 x 4
 y 2
 end
+arch wwall_2_1_2
+x 4
+y 2
+end
 arch woodfloor2
 x 4
 y 3
 end
+arch table_4
+x 4
+y 3
+end
+arch light4
+x 4
+y 4
+end
 arch woodfloor2
 x 4
 y 4
 end
+arch table_4
+x 4
+y 4
+end
 arch woodfloor2
 x 4
 y 5
 end
+arch table_4
+x 4
+y 5
+end
 arch woodfloor2
 x 4
 y 6
 end
+arch table_4
+x 4
+y 6
+end
+arch light4
+x 4
+y 7
+end
 arch woodfloor2
 x 4
 y 7
 end
+arch table_4
+x 4
+y 7
+end
 arch woodfloor2
 x 4
 y 8
 end
+arch wwall_0
+x 4
+y 8
+end
 arch woodfloor2
 x 4
 y 9
@@ -357,26 +419,62 @@ arch woodfloor2
 x 4
 y 10
 end
+arch light4
+x 4
+y 11
+end
 arch woodfloor2
 x 4
 y 11
+end
+arch button_small
+x 4
+y 12
+connected 1
+end
+arch woodfloor2
+x 4
+y 12
+end
+arch button_small
+x 4
+y 13
+connected 1
+end
+arch woodfloor2
+x 4
+y 13
 no_magic 1
 damned 1
 end
-arch oakdoor_2
+arch odoorn2_closed_1
+x 4
+y 13
+connected 1
+end
+arch dungeon_magic
+x 4
+y 14
+end
+arch invis_exit
 slaying /world/world_122_117
 hp 0
 sp 7
 x 4
-y 11
+y 14
 end
-arch woodfloor2
+arch grass_only
+x 4
+y 14
+end
+arch cobblestones2
+x 4
+y 15
+end
+arch cobblestones2
 x 5
 end
-arch wwall_2_1_2
-x 5
-end
-arch woodfloor2
+arch grass_only
 x 5
 y 1
 end
@@ -384,23 +482,39 @@ arch woodfloor2
 x 5
 y 2
 end
+arch wwall_2_1_2
+x 5
+y 2
+end
 arch woodfloor2
 x 5
 y 3
 end
+arch chair_1.2
+x 5
+y 3
+end
 arch woodfloor2
 x 5
 y 4
 end
+arch chair_1.2
+x 5
+y 4
+end
 arch woodfloor2
 x 5
 y 5
 end
+arch chair_1.2
+x 5
+y 5
+end
 arch woodfloor2
 x 5
 y 6
 end
-arch wwall_0
+arch chair_1.2
 x 5
 y 6
 end
@@ -408,6 +522,10 @@ arch woodfloor2
 x 5
 y 7
 end
+arch chair_1.2
+x 5
+y 7
+end
 arch woodfloor2
 x 5
 y 8
@@ -424,44 +542,61 @@ arch woodfloor2
 x 5
 y 11
 end
+arch button_small
+x 5
+y 12
+connected 1
+end
 arch woodfloor2
 x 5
-y 11
+y 12
+end
+arch woodfloor2
+x 5
+y 13
 end
 arch wwall_1_4
 x 5
-y 11
+y 13
+end
+arch dungeon_magic
+x 5
+y 14
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 0
+sp 7
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 14
+end
+arch cobblestones2
+x 5
+y 15
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
 end
 arch woodfloor2
 x 6
+y 2
 end
 arch wwall_2_1_2
 x 6
-end
-arch woodfloor2
-x 6
-y 1
-end
-arch food_table
-x 6
-y 1
-end
-arch woodfloor2
-x 6
-y 2
-end
-arch food_table
-x 6
 y 2
 end
 arch woodfloor2
 x 6
 y 3
 end
-arch food_table
-x 6
-y 3
-end
 arch woodfloor2
 x 6
 y 4
@@ -494,265 +629,515 @@ arch woodfloor2
 x 6
 y 11
 end
+arch woodfloor2
+x 6
+y 12
+end
+arch woodfloor2
+x 6
+y 13
+no_magic 1
+damned 1
+end
 arch wwall_2_1_2
 x 6
+y 13
+end
+arch grass_only
+x 6
+y 14
+end
+arch cobblestones2
+x 6
+y 15
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor2
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch woodfloor2
+x 7
+y 3
+end
+arch light4
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 5
+end
+arch woodfloor2
+x 7
+y 6
+end
+arch light4
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 8
+end
+arch wwall_0
+x 7
+y 8
+end
+arch woodfloor2
+x 7
+y 9
+end
+arch woodfloor2
+x 7
+y 10
+end
+arch light4
+x 7
 y 11
 end
 arch woodfloor2
 x 7
+y 11
+end
+arch woodfloor2
+x 7
+y 12
+end
+arch woodfloor2
+x 7
+y 13
+end
+arch wwall_2_1_2
+x 7
+y 13
+end
+arch grass_only
+x 7
+y 14
+end
+arch cobblestones2
+x 7
+y 15
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch woodfloor2
+x 8
+y 2
+end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch food_table
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch food_table
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch food_table
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch woodfloor2
+x 8
+y 7
+end
+arch woodfloor2
+x 8
+y 8
+end
+arch woodfloor2
+x 8
+y 9
+end
+arch woodfloor2
+x 8
+y 10
+end
+arch woodfloor2
+x 8
+y 11
+end
+arch woodfloor2
+x 8
+y 12
+end
+arch woodfloor2
+x 8
+y 13
+end
+arch wwall_2_1_2
+x 8
+y 13
+end
+arch grass_only
+x 8
+y 14
+end
+arch cobblestones2
+x 8
+y 15
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
 end
 arch wwall_3_3
-x 7
-end
-arch dungeon_magic
-x 7
-end
-arch woodfloor2
-x 7
-y 1
-end
-arch wwall_2_1_1
-x 7
-y 1
-end
-arch dungeon_magic
-x 7
-y 1
-end
-arch woodfloor2
-x 7
-y 2
-end
-arch wwall_2_1_1
-x 7
+x 9
 y 2
 end
 arch dungeon_magic
-x 7
+x 9
 y 2
 end
 arch woodfloor2
-x 7
+x 9
 y 3
 end
 arch wwall_2_1_1
-x 7
+x 9
 y 3
 end
 arch dungeon_magic
-x 7
+x 9
 y 3
 end
 arch woodfloor2
-x 7
+x 9
 y 4
 end
 arch wwall_2_1_1
-x 7
+x 9
 y 4
 end
 arch dungeon_magic
-x 7
+x 9
 y 4
 end
 arch woodfloor2
-x 7
+x 9
 y 5
 end
 arch wwall_2_1_1
-x 7
+x 9
 y 5
 end
 arch dungeon_magic
-x 7
+x 9
 y 5
 end
 arch woodfloor2
-x 7
+x 9
 y 6
 end
-arch wwall_2_2_1
-x 7
+arch wwall_2_1_1
+x 9
 y 6
 end
 arch dungeon_magic
-x 7
+x 9
 y 6
 end
 arch woodfloor2
-x 7
+x 9
 y 7
 end
-arch barrel
-x 7
+arch wwall_2_1_1
+x 9
+y 7
+end
+arch dungeon_magic
+x 9
 y 7
 end
 arch woodfloor2
-x 7
+x 9
 y 8
 end
-arch woodfloor2
-x 7
+arch wwall_2_2_1
+x 9
+y 8
+end
+arch dungeon_magic
+x 9
+y 8
+end
+arch light4
+x 9
 y 9
 end
 arch woodfloor2
-x 7
+x 9
+y 9
+end
+arch barrel
+x 9
+y 9
+end
+arch woodfloor2
+x 9
 y 10
 end
 arch woodfloor2
-x 7
-y 11
-end
-arch wwall_2_1_2
-x 7
+x 9
 y 11
 end
 arch woodfloor2
-x 8
+x 9
+y 12
+end
+arch light2
+x 9
+y 13
+end
+arch woodfloor2
+x 9
+y 13
+end
+arch wwall_win2
+x 9
+y 13
+end
+arch grass_only
+x 9
+y 14
+end
+arch cobblestones2
+x 9
+y 15
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor2
+x 10
+y 2
 end
 arch wwall_2_1_2
-x 8
+x 10
+y 2
 end
 arch dungeon_magic
-x 8
+x 10
+y 2
 end
 arch flagstone
-x 8
-y 1
+x 10
+y 3
 end
 arch rock
-x 8
-y 1
+x 10
+y 3
 move_block 0
 can_roll 0
 end
 arch flagstone
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch woodfloor
-x 8
+x 10
 y 4
 end
+arch woodfloor
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
 arch wwall_0
-x 8
-y 4
+x 10
+y 6
+end
+arch light3
+x 10
+y 7
 end
 arch woodfloor
-x 8
-y 5
+x 10
+y 7
 end
 arch swall_2_2_2
-x 8
-y 5
+x 10
+y 7
 end
 arch dungeon_magic
-x 8
-y 5
-end
-arch woodfloor2
-x 8
-y 6
-end
-arch swall_1_2_half
-x 8
-y 6
-end
-arch wwall_1_3
-x 8
-y 6
-end
-arch dungeon_magic
-x 8
-y 6
-end
-arch woodfloor2
-x 8
+x 10
 y 7
 end
 arch woodfloor2
-x 8
+x 10
+y 8
+end
+arch swall_1_2_half
+x 10
+y 8
+end
+arch wwall_1_3
+x 10
+y 8
+end
+arch dungeon_magic
+x 10
 y 8
 end
 arch woodfloor2
-x 8
+x 10
 y 9
 end
 arch woodfloor2
-x 8
+x 10
 y 10
 end
 arch woodfloor2
-x 8
-y 11
-end
-arch wwall_2_1_2
-x 8
+x 10
 y 11
 end
 arch woodfloor2
-x 9
+x 10
+y 12
+end
+arch woodfloor2
+x 10
+y 13
 end
 arch wwall_2_1_2
-x 9
+x 10
+y 13
+end
+arch grass_only
+x 10
+y 14
+end
+arch cobblestones2
+x 10
+y 15
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch woodfloor2
+x 11
+y 2
+end
+arch wwall_2_1_2
+x 11
+y 2
 end
 arch dungeon_magic
-x 9
-end
-arch flagstone
-x 9
-y 1
-end
-arch stove
-x 9
-y 1
-end
-arch flagstone
-x 9
+x 11
 y 2
 end
 arch flagstone
-x 9
+x 11
 y 3
 end
-arch flagstone
-x 9
+arch stove
+x 11
+y 3
+end
+arch light4
+x 11
 y 4
 end
-arch pedestal
-x 9
+arch flagstone
+x 11
 y 4
+end
+arch flagstone
+x 11
+y 5
+end
+arch flagstone
+x 11
+y 6
+end
+arch pedestal
+x 11
+y 6
 invisible 1
 connected 11
 end
 arch flagstone
-x 9
-y 5
+x 11
+y 7
 end
 arch ggate_closed
-x 9
-y 5
+x 11
+y 7
 connected 11
 no_magic 1
 damned 1
 end
 arch woodfloor2
-x 9
-y 6
+x 11
+y 8
 end
 arch check_inv
 slaying navar_kitchen
-x 9
-y 6
+x 11
+y 8
 connected 11
 end
 arch woodfloor2
-x 9
-y 7
+x 11
+y 9
 end
 arch trigger_marker
 slaying navar_kitchen
@@ -760,8 +1145,8 @@ msg
 You have one day's use of these facilities.
 endmsg
 food 504
-x 9
-y 7
+x 11
+y 9
 speed 1.0
 connected 10
 end
@@ -769,247 +1154,429 @@ arch altar_trigger
 name Drop 150 platinum to enter
 slaying money
 food 7500
-x 9
-y 7
+x 11
+y 9
 connected 10
 end
 arch woodfloor2
-x 9
-y 8
-end
-arch woodfloor2
-x 9
-y 9
-end
-arch woodfloor2
-x 9
+x 11
 y 10
 end
+arch light4
+x 11
+y 11
+end
+arch woodfloor2
+x 11
+y 11
+end
+arch woodfloor2
+x 11
+y 12
+end
 arch barrel
-x 9
-y 10
+x 11
+y 12
 end
 arch woodfloor2
-x 9
-y 11
+x 11
+y 13
 end
 arch wwall_2_1_2
-x 9
-y 11
+x 11
+y 13
+end
+arch grass_only
+x 11
+y 14
+end
+arch cobblestones2
+x 11
+y 15
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
 end
 arch woodfloor2
-x 10
+x 12
+y 2
 end
 arch wwall_2_1_2
-x 10
+x 12
+y 2
 end
 arch dungeon_magic
-x 10
+x 12
+y 2
 end
 arch flagstone
-x 10
-y 1
+x 12
+y 3
 end
 arch rock
-x 10
-y 1
+x 12
+y 3
 move_block 0
 can_roll 0
 end
 arch flagstone
-x 10
-y 2
-end
-arch woodfloor
-x 10
-y 3
-end
-arch woodfloor
-x 10
+x 12
 y 4
 end
+arch woodfloor
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
 arch wwall_0
-x 10
-y 4
+x 12
+y 6
+end
+arch light3
+x 12
+y 7
 end
 arch woodfloor
-x 10
-y 5
+x 12
+y 7
 end
 arch swall_2_2_3
-x 10
-y 5
+x 12
+y 7
 end
 arch dungeon_magic
-x 10
-y 5
+x 12
+y 7
 end
 arch woodfloor2
-x 10
-y 6
+x 12
+y 8
 end
 arch swall_1_2_half
-x 10
-y 6
+x 12
+y 8
 end
 arch wwall_1_4
-x 10
-y 6
-end
-arch dungeon_magic
-x 10
-y 6
-end
-arch woodfloor2
-x 10
-y 7
-end
-arch woodfloor2
-x 10
+x 12
 y 8
 end
-arch woodfloor2
-x 10
-y 9
+arch dungeon_magic
+x 12
+y 8
 end
-arch barrel
-x 10
+arch light4
+x 12
 y 9
 end
 arch woodfloor2
-x 10
-y 10
+x 12
+y 9
 end
-arch barrel
-x 10
+arch woodfloor2
+x 12
 y 10
 end
 arch woodfloor2
-x 10
+x 12
 y 11
 end
+arch barrel
+x 12
+y 11
+end
+arch woodfloor2
+x 12
+y 12
+end
+arch barrel
+x 12
+y 12
+end
+arch woodfloor2
+x 12
+y 13
+end
 arch wwall_2_1_2
-x 10
-y 11
+x 12
+y 13
+end
+arch grass_only
+x 12
+y 14
+end
+arch cobblestones2
+x 12
+y 15
+end
+arch cobblestones2
+x 13
+end
+arch grass_only
+x 13
+y 1
 end
 arch woodfloor2
-x 11
+x 13
+y 2
 end
 arch wwall_2_2_3
-x 11
-end
-arch dungeon_magic
-x 11
-end
-arch woodfloor2
-x 11
-y 1
-end
-arch wwall_2_1_1
-x 11
-y 1
-end
-arch dungeon_magic
-x 11
-y 1
-end
-arch woodfloor2
-x 11
-y 2
-end
-arch wwall_2_1_1
-x 11
+x 13
 y 2
 end
 arch dungeon_magic
-x 11
+x 13
 y 2
 end
 arch woodfloor2
-x 11
+x 13
 y 3
 end
 arch wwall_2_1_1
-x 11
+x 13
 y 3
 end
 arch dungeon_magic
-x 11
+x 13
 y 3
 end
 arch woodfloor2
-x 11
+x 13
 y 4
 end
 arch wwall_2_1_1
-x 11
+x 13
 y 4
 end
 arch dungeon_magic
-x 11
+x 13
 y 4
 end
 arch woodfloor2
-x 11
+x 13
 y 5
 end
 arch wwall_2_1_1
-x 11
+x 13
 y 5
 end
 arch dungeon_magic
-x 11
+x 13
 y 5
 end
 arch woodfloor2
-x 11
+x 13
 y 6
 end
+arch wwall_2_1_1
+x 13
+y 6
+end
+arch dungeon_magic
+x 13
+y 6
+end
+arch woodfloor2
+x 13
+y 7
+end
+arch wwall_2_1_1
+x 13
+y 7
+end
+arch dungeon_magic
+x 13
+y 7
+end
+arch woodfloor2
+x 13
+y 8
+end
 arch wwall_3_4
-x 11
-y 6
+x 13
+y 8
 end
 arch dungeon_magic
-x 11
-y 6
-end
-arch woodfloor2
-x 11
-y 7
-end
-arch wwall_2_1_1
-x 11
-y 7
-end
-arch woodfloor2
-x 11
-y 8
-end
-arch wwall_2_1_1
-x 11
+x 13
 y 8
 end
 arch woodfloor2
-x 11
+x 13
 y 9
 end
 arch wwall_2_1_1
-x 11
+x 13
 y 9
 end
 arch woodfloor2
-x 11
+x 13
 y 10
 end
 arch wwall_2_1_1
-x 11
+x 13
 y 10
 end
 arch woodfloor2
-x 11
+x 13
 y 11
 end
+arch wwall_2_1_1
+x 13
+y 11
+end
+arch woodfloor2
+x 13
+y 12
+end
+arch wwall_2_1_1
+x 13
+y 12
+end
+arch woodfloor2
+x 13
+y 13
+end
 arch wwall_2_2_4
-x 11
+x 13
+y 13
+end
+arch grass_only
+x 13
+y 14
+end
+arch cobblestones2
+x 13
+y 15
+end
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch grass_only
+x 14
+y 2
+end
+arch grass_only
+x 14
+y 3
+end
+arch grass_only
+x 14
+y 4
+end
+arch grass_only
+x 14
+y 5
+end
+arch grass_only
+x 14
+y 6
+end
+arch grass_only
+x 14
+y 7
+end
+arch grass_only
+x 14
+y 8
+end
+arch grass_only
+x 14
+y 9
+end
+arch grass_only
+x 14
+y 10
+end
+arch grass_only
+x 14
 y 11
 end
+arch grass_only
+x 14
+y 12
+end
+arch grass_only
+x 14
+y 13
+end
+arch grass_only
+x 14
+y 14
+end
+arch cobblestones2
+x 14
+y 15
+end
+arch cobblestones2
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
+y 2
+end
+arch grass_only
+x 15
+y 3
+end
+arch grass_only
+x 15
+y 4
+end
+arch grass_only
+x 15
+y 5
+end
+arch grass_only
+x 15
+y 6
+end
+arch grass_only
+x 15
+y 7
+end
+arch grass_only
+x 15
+y 8
+end
+arch grass_only
+x 15
+y 9
+end
+arch grass_only
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 12
+end
+arch grass_only
+x 15
+y 13
+end
+arch grass_only
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 3738700f0..286d29bd6 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -84,7 +84,7 @@ arch r_house1
 name Rosco's Kitchen
 slaying /navar_city/misc/kitchen
 hp 4
-sp 10
+sp 11
 y 7
 end
 arch dungeon_magic