diff --git a/navar_city/bow_shop b/navar_city/bow_shop
index 50d5c75e8..f3d1891eb 100644
--- a/navar_city/bow_shop
+++ b/navar_city/bow_shop
@@ -5,17 +5,17 @@ region navar
 shopitems bow:80;arrow:80;weapon:15;*:-80
 shopmax 5000
 shoprace *
-width 20
-height 10
+width 23
+height 13
 enter_x 4
 enter_y 8
 msg
 Created:  2010-08-04 Nicolas Weeger
-Modified: 2010-11-05 Andreas Kirschbaum
+Modified: 2011-04-24 Rick Tanner
 endmsg
 outdoor 1
 end
-arch grass_only
+arch cobblestones2
 end
 arch grass_only
 y 1
@@ -45,163 +45,176 @@ arch grass_only
 y 9
 end
 arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
 x 1
 end
-arch shop_empty
+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 cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch flagstone
+x 2
+y 2
+end
 arch redcwall_2_2_2
-x 1
-y 1
-end
-arch shop_empty
-x 1
+x 2
 y 2
 end
-arch redcwall_2_1_1
-x 1
-y 2
-end
-arch shop_empty
-x 1
+arch flagstone
+x 2
 y 3
 end
 arch redcwall_2_1_1
-x 1
+x 2
 y 3
 end
-arch shop_empty
-x 1
+arch flagstone
+x 2
 y 4
 end
 arch redcwall_2_1_1
-x 1
+x 2
 y 4
 end
-arch shop_empty
-x 1
+arch flagstone
+x 2
 y 5
 end
 arch redcwall_2_1_1
-x 1
+x 2
 y 5
 end
-arch shop_empty
-x 1
+arch flagstone
+x 2
 y 6
 end
+arch swall_1_4_half
+x 2
+y 6
+end
+arch redcwall_2_1_1
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 7
+end
 arch redcwall_win1
-x 1
-y 6
+x 2
+y 7
 end
 arch flagstone
-name floor
-face shop_empty.111
-x 1
-y 7
+x 2
+y 8
 end
 arch redcwall_2_1_1
-x 1
-y 7
+x 2
+y 8
 end
 arch flagstone
-name floor
-face shop_empty.111
-x 1
-y 8
+x 2
+y 9
 end
 arch redcwall_2_2_1
-x 1
-y 8
-end
-arch grass_only
-x 1
-y 9
-end
-arch grass_only
-x 2
-end
-arch shop_empty
-x 2
-y 1
-end
-arch redcwall_2_1_2
-x 2
-y 1
-end
-arch shop_throw
-x 2
-y 2
-end
-arch shop_throw
-x 2
-y 3
-end
-arch shop_throw
-x 2
-y 4
-end
-arch shop_empty
-x 2
-y 5
-end
-arch shop_empty
-x 2
-y 6
-end
-arch swall_1_4
-x 2
-y 6
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 7
-end
-arch shop_mat
-x 2
-y 7
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 8
-end
-arch redcwall_2_1_2
-x 2
-y 8
-end
-arch grass_only
 x 2
 y 9
 end
 arch grass_only
+x 2
+y 10
+end
+arch grass_only
+x 2
+y 11
+end
+arch cobblestones2
+x 2
+y 12
+end
+arch cobblestones2
 x 3
 end
-arch shop_empty
+arch grass_only
 x 3
 y 1
 end
-arch redcwall_2_1_2
-x 3
-y 1
-end
-arch shop_throw
+arch flagstone
 x 3
 y 2
 end
-arch shop_empty
+arch redcwall_2_1_2
+x 3
+y 2
+end
+arch shop_throw
 x 3
 y 3
 end
-arch shop_empty
+arch shop_throw
 x 3
 y 4
 end
-arch shop_empty
+arch shop_throw
 x 3
 y 5
 end
@@ -219,48 +232,50 @@ face shop_empty.111
 x 3
 y 7
 end
-arch light4
-x 3
-y 7
-end
 arch flagstone
 name floor
 face shop_empty.111
 x 3
 y 8
 end
-arch redcwall_1_3
+arch flagstone
 x 3
-y 8
+y 9
+end
+arch redcwall_win2
+x 3
+y 9
 end
 arch grass_only
 x 3
-y 9
-move_block all
+y 10
+end
+arch grass_only
+x 3
+y 11
+end
+arch cobblestones2
+x 3
+y 12
 end
 arch cobblestones2
 x 4
 end
-arch shop_empty
+arch grass_only
 x 4
 y 1
 end
-arch redcwall_win2
-x 4
-y 1
-end
-arch shop_throw
+arch flagstone
 x 4
 y 2
 end
-arch shop_empty
+arch redcwall_2_1_2
 x 4
-y 3
+y 2
 end
-arch light4
+arch shop_throw
 x 4
 y 3
-unpaid 1
 end
 arch shop_empty
 x 4
@@ -288,307 +303,466 @@ face shop_empty.111
 x 4
 y 7
 end
+arch shop_mat
+x 4
+y 7
+end
+arch light4
+x 4
+y 8
+end
 arch flagstone
 name floor
 face shop_empty.111
 x 4
 y 8
 end
-arch look_door_exit_1
+arch flagstone
+x 4
+y 9
+end
+arch redcwall_2_1_2
+x 4
+y 9
+end
+arch grass_only
+x 4
+y 10
+end
+arch grass_only
+x 4
+y 11
+move_block all
+end
+arch cobblestones2
+x 4
+y 12
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch flagstone
+x 5
+y 2
+end
+arch redcwall_win2
+x 5
+y 2
+end
+arch shop_throw
+x 5
+y 3
+end
+arch light4
+x 5
+y 4
+unpaid 1
+end
+arch shop_empty
+x 5
+y 4
+end
+arch shop_empty
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 6
+end
+arch swall_2_1_2
+x 5
+y 6
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 5
+y 7
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 5
+y 8
+end
+arch flagstone
+x 5
+y 9
+end
+arch redcwall_win2
+x 5
+y 9
+end
+arch grass_only
+x 5
+y 10
+end
+arch grass_only
+x 5
+y 11
+end
+arch cobblestones2
+x 5
+y 12
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch flagstone
+x 6
+y 2
+end
+arch redcwall_2_1_2
+x 6
+y 2
+end
+arch shop_throw
+x 6
+y 3
+end
+arch shop_empty
+x 6
+y 4
+end
+arch shop_empty
+x 6
+y 5
+end
+arch shop_empty
+x 6
+y 6
+end
+arch swall_2_1_2
+x 6
+y 6
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 6
+y 7
+end
+arch menu
+x 6
+y 7
+end
+arch button_small
+x 6
+y 8
+connected 1
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 6
+y 8
+end
+arch flagstone
+x 6
+y 9
+end
+arch redcwall_1_3
+x 6
+y 9
+end
+arch dungeon_magic
+x 6
+y 10
+end
+arch invis_exit
 name exit
 slaying /world/world_122_117
 hp 12
 sp 14
-x 4
-y 8
+x 6
+y 10
+end
+arch grass_only
+x 6
+y 10
+end
+arch grass_only
+x 6
+y 11
 end
 arch cobblestones2
-x 4
-y 9
-move_block all
+x 6
+y 12
 end
 arch cobblestones2
-x 5
+x 7
 end
-arch shop_empty
-x 5
+arch grass_only
+x 7
 y 1
 end
+arch flagstone
+x 7
+y 2
+end
 arch redcwall_2_1_2
-x 5
-y 1
-end
-arch shop_throw
-x 5
+x 7
 y 2
 end
 arch shop_empty
-x 5
+x 7
 y 3
 end
 arch shop_empty
-x 5
+x 7
 y 4
 end
 arch shop_empty
-x 5
+x 7
 y 5
 end
 arch shop_empty
-x 5
+x 7
 y 6
 end
 arch swall_2_1_2
-x 5
+x 7
 y 6
 end
 arch flagstone
 name floor
 face shop_empty.111
-x 5
+x 7
 y 7
 end
+arch button_small
+x 7
+y 8
+connected 1
+end
 arch flagstone
 name floor
 face shop_empty.111
-x 5
+x 7
 y 8
 end
-arch look_door_exit_1
+arch button_small
+x 7
+y 9
+connected 1
+end
+arch flagstone
+x 7
+y 9
+end
+arch odoorn2_closed_1
+x 7
+y 9
+connected 1
+end
+arch dungeon_magic
+x 7
+y 10
+end
+arch invis_exit
 name exit
 slaying /world/world_122_117
-hp 13
+hp 12
 sp 14
-x 5
-y 8
+x 7
+y 10
+end
+arch grass_only
+x 7
+y 10
+end
+arch grass_only
+x 7
+y 11
 end
 arch cobblestones2
-x 5
-y 9
-move_block all
+x 7
+y 12
 end
 arch cobblestones2
-x 6
+x 8
 end
-arch shop_empty
-x 6
+arch grass_only
+x 8
 y 1
 end
-arch redcwall_2_1_2
-x 6
-y 1
-end
-arch shop_empty
-x 6
+arch flagstone
+x 8
 y 2
 end
-arch shop_empty
-x 6
+arch redcwall_2_1_2
+x 8
+y 2
+end
+arch shop_throw
+x 8
 y 3
 end
 arch shop_empty
-x 6
+x 8
 y 4
 end
-arch shop_empty
-x 6
+arch shop_throw
+x 8
 y 5
 end
 arch shop_empty
-x 6
+x 8
 y 6
 end
 arch swall_2_2_3
-x 6
+x 8
 y 6
 end
 arch shop_empty
-x 6
+x 8
 y 7
 end
-arch swall_1_2
-x 6
+arch swall_2_1_1
+x 8
 y 7
 end
 arch shop_empty
-x 6
+x 8
 y 8
 end
+arch swall_2_1_1
+x 8
+y 8
+end
+arch flagstone
+x 8
+y 9
+end
+arch swall_1_2_half
+x 8
+y 9
+end
 arch redcwall_1_4
-x 6
-y 8
-end
-arch cobblestones2
-x 6
+x 8
 y 9
-move_block all
+end
+arch dungeon_magic
+x 8
+y 10
+end
+arch invis_exit
+name exit
+slaying /world/world_122_117
+hp 12
+sp 14
+x 8
+y 10
+end
+arch grass_only
+x 8
+y 10
+end
+arch grass_only
+x 8
+y 11
 end
 arch cobblestones2
-x 7
+x 8
+y 12
 end
-arch shop_empty
-x 7
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
-arch redcwall_2_1_2
-x 7
-y 1
-end
-arch shop_throw
-x 7
+arch flagstone
+x 9
 y 2
 end
-arch shop_empty
-x 7
-y 3
+arch redcwall_2_1_2
+x 9
+y 2
 end
 arch shop_throw
-x 7
+x 9
+y 3
+end
+arch shop_empty
+x 9
 y 4
 end
 arch shop_throw
-x 7
-y 5
-end
-arch shop_empty
-x 7
-y 6
-end
-arch shop_throw
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 8
-end
-arch redcwall_2_1_2
-x 7
-y 8
-end
-arch cobblestones2
-x 7
-y 9
-end
-arch cobblestones2
-x 8
-end
-arch shop_empty
-x 8
-y 1
-end
-arch redcwall_2_1_2
-x 8
-y 1
-end
-arch shop_throw
-x 8
-y 2
-end
-arch shop_empty
-x 8
-y 3
-end
-arch shop_throw
-x 8
-y 4
-end
-arch shop_throw
-x 8
+x 9
 y 5
 end
 arch light4
-x 8
-y 5
+x 9
+y 6
 unpaid 1
 end
-arch shop_empty
-x 8
-y 6
-end
 arch shop_throw
-x 8
-y 7
-end
-arch shop_empty
-x 8
-y 8
-end
-arch redcwall_2_1_2
-x 8
-y 8
-end
-arch cobblestones2
-x 8
-y 9
-end
-arch cobblestones2
-x 9
-end
-arch shop_empty
-x 9
-y 1
-end
-arch redcwall_2_1_2
-x 9
-y 1
-end
-arch shop_throw
-x 9
-y 2
-end
-arch shop_empty
-x 9
-y 3
-end
-arch shop_throw
-x 9
-y 4
-end
-arch shop_throw
-x 9
-y 5
-end
-arch shop_empty
 x 9
 y 6
 end
-arch shop_throw
+arch shop_empty
 x 9
 y 7
 end
-arch shop_empty
+arch shop_throw
 x 9
 y 8
 end
-arch redcwall_win2
-x 9
-y 8
-end
-arch cobblestones2
+arch flagstone
 x 9
 y 9
 end
+arch redcwall_2_2_3
+x 9
+y 9
+end
+arch flagstone
+x 9
+y 10
+end
+arch redcwall_2_2_1
+x 9
+y 10
+end
+arch grass_only
+x 9
+y 11
+end
+arch cobblestones2
+x 9
+y 12
+end
 arch cobblestones2
 x 10
 end
-arch shop_empty
+arch grass_only
 x 10
 y 1
 end
-arch redcwall_2_1_2
-x 10
-y 1
-end
-arch shop_throw
+arch flagstone
 x 10
 y 2
 end
-arch shop_empty
+arch redcwall_2_1_2
+x 10
+y 2
+end
+arch shop_throw
 x 10
 y 3
 end
-arch shop_throw
+arch shop_empty
 x 10
 y 4
 end
@@ -596,45 +770,120 @@ arch shop_throw
 x 10
 y 5
 end
-arch shop_empty
+arch shop_throw
 x 10
 y 6
 end
-arch shop_throw
+arch shop_empty
 x 10
 y 7
 end
-arch shop_empty
+arch shop_throw
 x 10
 y 8
 end
-arch redcwall_2_1_2
-x 10
-y 8
-end
-arch cobblestones2
+arch shop_throw
 x 10
 y 9
 end
+arch flagstone
+x 10
+y 10
+end
+arch redcwall_2_1_2
+x 10
+y 10
+end
+arch grass_only
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 12
+end
 arch cobblestones2
 x 11
 end
-arch shop_empty
+arch grass_only
 x 11
 y 1
 end
-arch redcwall_2_1_2
-x 11
-y 1
-end
-arch shop_empty
+arch flagstone
 x 11
 y 2
 end
-arch shop_empty
+arch redcwall_2_1_2
+x 11
+y 2
+end
+arch shop_throw
 x 11
 y 3
 end
+arch shop_empty
+x 11
+y 4
+end
+arch shop_throw
+x 11
+y 5
+end
+arch shop_throw
+x 11
+y 6
+end
+arch shop_empty
+x 11
+y 7
+end
+arch shop_throw
+x 11
+y 8
+end
+arch shop_throw
+x 11
+y 9
+end
+arch flagstone
+x 11
+y 10
+end
+arch redcwall_2_1_2
+x 11
+y 10
+end
+arch grass_only
+x 11
+y 11
+end
+arch cobblestones2
+x 11
+y 12
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch flagstone
+x 12
+y 2
+end
+arch redcwall_2_1_2
+x 12
+y 2
+end
+arch shop_empty
+x 12
+y 3
+end
+arch shop_empty
+x 12
+y 4
+end
 arch guildmaster
 name Pimol
 msg
@@ -647,8 +896,8 @@ endmsg
 face monk.151
 hp 100
 maxhp 100
-x 11
-y 3
+x 12
+y 4
 speed 1.0
 type 0
 randomitems throw_stnd
@@ -657,57 +906,6 @@ stand_still 1
 random_movement 1
 end
 arch shop_empty
-x 11
-y 4
-end
-arch shop_empty
-x 11
-y 5
-end
-arch shop_empty
-x 11
-y 6
-end
-arch shop_empty
-x 11
-y 7
-end
-arch shop_empty
-x 11
-y 8
-end
-arch redcwall_2_1_2
-x 11
-y 8
-end
-arch cobblestones2
-x 11
-y 9
-end
-arch cobblestones2
-x 12
-end
-arch shop_empty
-x 12
-y 1
-end
-arch redcwall_2_1_2
-x 12
-y 1
-end
-arch shop_throw
-x 12
-y 2
-end
-arch shop_empty
-x 12
-y 3
-end
-arch shop_throw
-x 12
-y 4
-end
-arch shop_throw
 x 12
 y 5
 end
@@ -715,7 +913,7 @@ arch shop_empty
 x 12
 y 6
 end
-arch shop_throw
+arch shop_empty
 x 12
 y 7
 end
@@ -723,39 +921,46 @@ arch shop_empty
 x 12
 y 8
 end
-arch redcwall_2_1_2
-x 12
-y 8
-end
-arch cobblestones2
+arch shop_empty
 x 12
 y 9
 end
-arch cobblestones2
-x 13
-end
-arch shop_empty
-x 13
-y 1
+arch flagstone
+x 12
+y 10
 end
 arch redcwall_win2
+x 12
+y 10
+end
+arch grass_only
+x 12
+y 11
+end
+arch cobblestones2
+x 12
+y 12
+end
+arch cobblestones2
+x 13
+end
+arch grass_only
 x 13
 y 1
 end
+arch flagstone
+x 13
+y 2
+end
+arch redcwall_2_1_2
+x 13
+y 2
+end
 arch shop_throw
 x 13
-y 2
-end
-arch light4
-x 13
-y 2
-unpaid 1
-end
-arch shop_empty
-x 13
 y 3
 end
-arch shop_throw
+arch shop_empty
 x 13
 y 4
 end
@@ -763,98 +968,122 @@ arch shop_throw
 x 13
 y 5
 end
-arch shop_empty
+arch shop_throw
 x 13
 y 6
 end
-arch shop_throw
+arch shop_empty
 x 13
 y 7
 end
-arch shop_empty
+arch shop_throw
 x 13
 y 8
 end
-arch redcwall_2_1_2
-x 13
-y 8
-end
-arch cobblestones2
+arch shop_throw
 x 13
 y 9
 end
+arch flagstone
+x 13
+y 10
+end
+arch redcwall_2_1_2
+x 13
+y 10
+end
+arch grass_only
+x 13
+y 11
+end
+arch cobblestones2
+x 13
+y 12
+end
 arch cobblestones2
 x 14
 end
-arch shop_empty
+arch grass_only
 x 14
 y 1
 end
-arch redcwall_2_1_2
-x 14
-y 1
-end
-arch shop_throw
+arch flagstone
 x 14
 y 2
 end
-arch shop_empty
+arch redcwall_win2
 x 14
-y 3
-end
-arch shop_throw
-x 14
-y 4
-end
-arch shop_throw
-x 14
-y 5
-end
-arch shop_empty
-x 14
-y 6
+y 2
 end
 arch light4
 x 14
-y 6
+y 3
 unpaid 1
 end
 arch shop_throw
 x 14
-y 7
+y 3
 end
 arch shop_empty
 x 14
-y 8
+y 4
 end
-arch redcwall_2_1_2
+arch shop_throw
+x 14
+y 5
+end
+arch shop_throw
+x 14
+y 6
+end
+arch shop_empty
+x 14
+y 7
+end
+arch shop_throw
 x 14
 y 8
 end
-arch cobblestones2
+arch shop_throw
 x 14
 y 9
 end
+arch flagstone
+x 14
+y 10
+end
+arch redcwall_win2
+x 14
+y 10
+end
+arch grass_only
+x 14
+y 11
+end
+arch cobblestones2
+x 14
+y 12
+end
 arch cobblestones2
 x 15
 end
-arch shop_empty
+arch grass_only
 x 15
 y 1
 end
-arch redcwall_2_1_2
-x 15
-y 1
-end
-arch shop_throw
+arch flagstone
 x 15
 y 2
 end
-arch shop_empty
+arch redcwall_2_1_2
+x 15
+y 2
+end
+arch shop_throw
 x 15
 y 3
 end
-arch shop_throw
+arch shop_empty
 x 15
 y 4
 end
@@ -862,110 +1091,134 @@ arch shop_throw
 x 15
 y 5
 end
-arch shop_empty
+arch shop_throw
 x 15
 y 6
 end
-arch shop_throw
-x 15
-y 7
-end
-arch shop_empty
-x 15
-y 8
-end
-arch redcwall_2_1_2
-x 15
-y 8
-end
-arch cobblestones2
-x 15
-y 9
-end
-arch cobblestones2
-x 16
-end
-arch shop_empty
-x 16
-y 1
-end
-arch redcwall_2_1_2
-x 16
-y 1
-end
-arch shop_empty
-x 16
-y 2
-end
-arch shop_empty
-x 16
-y 3
-end
-arch shop_empty
-x 16
-y 4
-end
-arch shop_empty
-x 16
-y 5
-end
-arch shop_empty
-x 16
-y 6
-end
-arch shop_empty
-x 16
-y 7
-end
-arch shop_empty
-x 16
-y 8
-end
-arch redcwall_2_1_2
-x 16
-y 8
-end
-arch cobblestones2
-x 16
-y 9
-end
-arch cobblestones2
-x 17
-end
-arch shop_empty
-x 17
-y 1
-end
-arch redcwall_2_1_2
-x 17
-y 1
-end
-arch shop_throw
-x 17
-y 2
-end
-arch shop_throw
-x 17
-y 3
-end
-arch shop_throw
-x 17
-y 4
-end
 arch light4
-x 17
-y 4
+x 15
+y 7
 unpaid 1
 end
+arch shop_empty
+x 15
+y 7
+end
 arch shop_throw
-x 17
+x 15
+y 8
+end
+arch shop_throw
+x 15
+y 9
+end
+arch flagstone
+x 15
+y 10
+end
+arch redcwall_2_1_2
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch cobblestones2
+x 15
+y 12
+end
+arch cobblestones2
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch redcwall_2_1_2
+x 16
+y 2
+end
+arch shop_throw
+x 16
+y 3
+end
+arch shop_empty
+x 16
+y 4
+end
+arch shop_throw
+x 16
 y 5
 end
 arch shop_throw
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+end
+arch shop_throw
+x 16
+y 8
+end
+arch shop_throw
+x 16
+y 9
+end
+arch flagstone
+x 16
+y 10
+end
+arch redcwall_2_1_2
+x 16
+y 10
+end
+arch grass_only
+x 16
+y 11
+end
+arch cobblestones2
+x 16
+y 12
+end
+arch cobblestones2
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch flagstone
+x 17
+y 2
+end
+arch redcwall_2_1_2
+x 17
+y 2
+end
+arch shop_empty
+x 17
+y 3
+end
+arch shop_empty
+x 17
+y 4
+end
+arch shop_empty
+x 17
+y 5
+end
+arch shop_empty
 x 17
 y 6
 end
-arch shop_throw
+arch shop_empty
 x 17
 y 7
 end
@@ -973,121 +1226,335 @@ arch shop_empty
 x 17
 y 8
 end
+arch shop_empty
+x 17
+y 9
+end
+arch flagstone
+x 17
+y 10
+end
 arch redcwall_2_1_2
 x 17
-y 8
+y 10
+end
+arch grass_only
+x 17
+y 11
 end
 arch cobblestones2
 x 17
-y 9
+y 12
 end
 arch cobblestones2
 x 18
 end
-arch shop_empty
+arch grass_only
 x 18
 y 1
 end
+arch flagstone
+x 18
+y 2
+end
+arch redcwall_2_1_2
+x 18
+y 2
+end
+arch shop_empty
+x 18
+y 3
+end
+arch shop_empty
+x 18
+y 4
+end
+arch shop_empty
+x 18
+y 5
+end
+arch shop_empty
+x 18
+y 6
+end
+arch shop_empty
+x 18
+y 7
+end
+arch shop_empty
+x 18
+y 8
+end
+arch shop_empty
+x 18
+y 9
+end
+arch flagstone
+x 18
+y 10
+end
+arch redcwall_2_1_2
+x 18
+y 10
+end
+arch grass_only
+x 18
+y 11
+end
+arch cobblestones2
+x 18
+y 12
+end
+arch cobblestones2
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch flagstone
+x 19
+y 2
+end
+arch redcwall_2_1_2
+x 19
+y 2
+end
+arch shop_throw
+x 19
+y 3
+end
+arch shop_throw
+x 19
+y 4
+end
+arch light4
+x 19
+y 5
+unpaid 1
+end
+arch shop_throw
+x 19
+y 5
+end
+arch shop_throw
+x 19
+y 6
+end
+arch shop_throw
+x 19
+y 7
+end
+arch shop_throw
+x 19
+y 8
+end
+arch shop_throw
+x 19
+y 9
+end
+arch flagstone
+x 19
+y 10
+end
+arch redcwall_2_1_2
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch cobblestones2
+x 19
+y 12
+end
+arch cobblestones2
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch flagstone
+x 20
+y 2
+end
 arch redcwall_2_2_3
-x 18
-y 1
-end
-arch shop_empty
-x 18
+x 20
 y 2
 end
+arch flagstone
+x 20
+y 3
+end
 arch redcwall_2_1_1
-x 18
-y 2
-end
-arch shop_empty
-x 18
+x 20
 y 3
 end
+arch flagstone
+x 20
+y 4
+end
 arch redcwall_win1
-x 18
-y 3
-end
-arch shop_empty
-x 18
+x 20
 y 4
 end
-arch redcwall_2_1_1
-x 18
-y 4
-end
-arch shop_empty
-x 18
+arch flagstone
+x 20
 y 5
 end
 arch redcwall_2_1_1
-x 18
+x 20
 y 5
 end
-arch shop_empty
-x 18
+arch flagstone
+x 20
 y 6
 end
 arch redcwall_2_1_1
-x 18
+x 20
 y 6
 end
-arch shop_empty
-x 18
+arch flagstone
+x 20
 y 7
 end
-arch redcwall_win1
-x 18
+arch redcwall_2_1_1
+x 20
 y 7
 end
-arch shop_empty
-x 18
+arch flagstone
+x 20
 y 8
 end
+arch redcwall_win1
+x 20
+y 8
+end
+arch flagstone
+x 20
+y 9
+end
+arch redcwall_2_1_1
+x 20
+y 9
+end
+arch flagstone
+x 20
+y 10
+end
 arch redcwall_2_2_4
-x 18
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch cobblestones2
+x 20
+y 12
+end
+arch cobblestones2
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch grass_only
+x 21
+y 2
+end
+arch grass_only
+x 21
+y 3
+end
+arch grass_only
+x 21
+y 4
+end
+arch grass_only
+x 21
+y 5
+end
+arch grass_only
+x 21
+y 6
+end
+arch grass_only
+x 21
+y 7
+end
+arch grass_only
+x 21
 y 8
 end
-arch cobblestones2
-x 18
+arch grass_only
+x 21
 y 9
 end
-arch cobblestones2
-x 19
+arch grass_only
+x 21
+y 10
+end
+arch grass_only
+x 21
+y 11
 end
 arch cobblestones2
-x 19
+x 21
+y 12
+end
+arch cobblestones2
+x 22
+end
+arch cobblestones2
+x 22
 y 1
 end
 arch cobblestones2
-x 19
+x 22
 y 2
 end
 arch cobblestones2
-x 19
+x 22
 y 3
 end
 arch cobblestones2
-x 19
+x 22
 y 4
 end
 arch cobblestones2
-x 19
+x 22
 y 5
 end
 arch cobblestones2
-x 19
+x 22
 y 6
 end
 arch cobblestones2
-x 19
+x 22
 y 7
 end
 arch cobblestones2
-x 19
+x 22
 y 8
 end
 arch cobblestones2
-x 19
+x 22
 y 9
 end
+arch cobblestones2
+x 22
+y 10
+end
+arch cobblestones2
+x 22
+y 11
+end
+arch cobblestones2
+x 22
+y 12
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 2243ac61c..c3cfb107d 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2010-08-04 Nicolas Weeger
+Modified: 2011-04-24 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -4415,8 +4415,8 @@ end
 arch farmhouse
 name Pimol's Fine Bow Shop
 slaying /navar_city/bow_shop
-hp 4
-sp 8
+hp 7
+sp 7
 x 12
 y 14
 end