diff --git a/scorn/houses/tannery b/scorn/houses/tannery
index 728ae2b3a..ec9f5b786 100644
--- a/scorn/houses/tannery
+++ b/scorn/houses/tannery
@@ -2,359 +2,577 @@ arch map
 name Scorn Tannery
 difficulty 2
 region scorn
-width 11
-height 12
+width 15
+height 16
 enter_x 5
 enter_y 10
 msg
 Created:  2002-12-29
 Modified: 2011-09-17 Rick Tanner
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch grass_only
+y 1
+end
+arch grass_only
+y 2
+end
+arch grass_only
+y 3
+end
+arch grass_only
+y 4
+end
+arch grass_only
+y 5
+end
+arch grass_only
+y 6
+end
+arch grass_only
+y 7
+end
+arch grass_only
+y 8
+end
+arch grass_only
+y 9
+end
+arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch grass_only
+y 12
+end
+arch grass_only
+y 13
+end
+arch grass_only
+y 14
+end
+arch grass_only
+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 grass_only
+x 1
+y 15
+end
+arch cobblestones2
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch dirtfloor
+x 2
+y 2
 end
 arch wall_2_2_2
-end
-arch dirtfloor
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch dirtfloor
-y 2
-end
-arch wall_2_1_1
+x 2
 y 2
 end
 arch dirtfloor
+x 2
 y 3
 end
 arch wall_2_1_1
+x 2
 y 3
 end
-arch dirtfloor
-y 4
-end
-arch swall_1_4_half
-y 4
-end
-arch wall_2_1_1
+arch light2
+x 2
 y 4
 end
 arch dirtfloor
+x 2
+y 4
+end
+arch window_win1
+x 2
+y 4
+end
+arch dirtfloor
+x 2
 y 5
 end
 arch wall_2_1_1
+x 2
 y 5
 end
 arch dirtfloor
+x 2
 y 6
 end
 arch swall_1_4_half
+x 2
 y 6
 end
 arch wall_2_1_1
+x 2
 y 6
 end
-arch dirtfloor
-y 7
-end
-arch wall_2_1_1
+arch light2
+x 2
 y 7
 end
 arch dirtfloor
+x 2
+y 7
+end
+arch window_win1
+x 2
+y 7
+end
+arch dirtfloor
+x 2
+y 8
+end
+arch swall_1_4_half
+x 2
 y 8
 end
 arch wall_2_1_1
+x 2
 y 8
 end
 arch dirtfloor
+x 2
 y 9
 end
 arch wall_2_1_1
+x 2
 y 9
 end
 arch dirtfloor
+x 2
 y 10
 end
 arch wall_2_1_1
+x 2
 y 10
 end
 arch dirtfloor
+x 2
 y 11
 end
+arch wall_2_1_1
+x 2
+y 11
+end
+arch dirtfloor
+x 2
+y 12
+end
+arch wall_2_1_1
+x 2
+y 12
+end
+arch dirtfloor
+x 2
+y 13
+end
 arch wall_2_2_1
-y 11
+x 2
+y 13
+end
+arch grass_only
+x 2
+y 14
+end
+arch grass_only
+x 2
+y 15
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch dirtfloor
-x 1
+x 3
+y 2
 end
 arch wall_2_1_2
-x 1
+x 3
+y 2
 end
 arch dirtfloor
-x 1
-y 1
+x 3
+y 3
 end
 arch pix_wing
-x 1
-y 1
+x 3
+y 3
 end
 arch dirtfloor
-x 1
-y 2
+x 3
+y 4
 end
 arch sheepskin
-x 1
-y 2
-end
-arch dirtfloor
-x 1
-y 3
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch serp_skin
-x 1
-y 3
-no_pick 1
-identified 1
-end
-arch dirtfloor
-x 1
+x 3
 y 4
 end
+arch dirtfloor
+x 3
+y 5
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch serp_skin
+x 3
+y 5
+no_pick 1
+identified 1
+end
+arch dirtfloor
+x 3
+y 6
+end
 arch ggate_closed
-x 1
-y 4
+x 3
+y 6
 no_magic 1
 damned 1
 end
 arch dirtfloor
-x 1
-y 5
+x 3
+y 7
 end
 arch dirtfloor
-x 1
-y 6
+x 3
+y 8
 end
 arch ggate_open
-x 1
-y 6
-end
-arch dirtfloor
-x 1
-y 7
-end
-arch dirtfloor
-x 1
+x 3
 y 8
 end
 arch dirtfloor
-x 1
+x 3
 y 9
 end
-arch dirtfloor
-x 1
+arch light4
+x 3
 y 10
 end
 arch dirtfloor
-x 1
-y 11
+x 3
+y 10
 end
-arch wall_2_1_2
-x 1
+arch dirtfloor
+x 3
 y 11
 end
 arch dirtfloor
-x 2
+x 3
+y 12
+end
+arch dirtfloor
+x 3
+y 13
 end
 arch wall_2_1_2
-x 2
+x 3
+y 13
+end
+arch grass_only
+x 3
+y 14
+end
+arch grass_only
+x 3
+y 15
+end
+arch cobblestones2
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch dirtfloor
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
+y 2
 end
 arch swall_1_1_half
-x 2
-end
-arch dirtfloor
-x 2
-y 1
-end
-arch swall_2_1_1
-x 2
-y 1
-end
-arch dirtfloor
-x 2
-y 2
-end
-arch swall_2_1_1
-x 2
+x 4
 y 2
 end
 arch dirtfloor
-x 2
+x 4
 y 3
 end
 arch swall_2_1_1
-x 2
+x 4
 y 3
 end
 arch dirtfloor
-x 2
+x 4
 y 4
 end
-arch swall_2_2_4
-x 2
-y 4
-end
-arch awall_0
-x 2
+arch swall_2_1_1
+x 4
 y 4
 end
 arch dirtfloor
-x 2
+x 4
+y 5
+end
+arch swall_2_1_1
+x 4
 y 5
 end
 arch dirtfloor
-x 2
+x 4
 y 6
 end
+arch swall_2_2_4
+x 4
+y 6
+end
+arch awall_0
+x 4
+y 6
+end
+arch dirtfloor
+x 4
+y 7
+end
+arch dirtfloor
+x 4
+y 8
+end
 arch swall_2_1_2
-x 2
-y 6
-end
-arch dirtfloor
-x 2
-y 7
-end
-arch platinum_converter
-x 2
-y 7
-end
-arch dirtfloor
-x 2
-y 8
-end
-arch platinum_converter
-x 2
+x 4
 y 8
 end
 arch dirtfloor
-x 2
+x 4
 y 9
 end
 arch platinum_converter
-x 2
+x 4
 y 9
 end
 arch dirtfloor
-x 2
+x 4
+y 10
+end
+arch platinum_converter
+x 4
 y 10
 end
 arch dirtfloor
-x 2
+x 4
 y 11
 end
-arch wall_2_1_2
-x 2
+arch platinum_converter
+x 4
 y 11
 end
 arch dirtfloor
-x 3
+x 4
+y 12
 end
-arch wall_2_1_2
-x 3
+arch light2
+x 4
+y 13
 end
 arch dirtfloor
-x 3
+x 4
+y 13
+end
+arch window_win2
+x 4
+y 13
+end
+arch grass_only
+x 4
+y 14
+end
+arch grass_only
+x 4
+y 15
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
+arch light2
+x 5
+y 2
+end
+arch dirtfloor
+x 5
+y 2
+end
+arch window_win2
+x 5
+y 2
+end
+arch dirtfloor
+x 5
+y 3
+end
 arch rock
-x 3
-y 1
+x 5
+y 3
 move_block 0
 can_roll 0
 end
@@ -365,233 +583,287 @@ Gloves of Marksmanship can be made with
 gloves, 5 arrows of accuracy, and a bottle
 of mineral oil.
 endmsg
-x 3
-y 1
+x 5
+y 3
 no_pick 1
 identified 1
 end
 arch dirtfloor
-x 3
-y 2
-end
-arch dirtfloor
-x 3
-y 3
-end
-arch dirtfloor
-x 3
+x 5
 y 4
 end
-arch dirtfloor
-x 3
+arch light4
+x 5
 y 5
 end
-arch flagstone
-x 3
+arch dirtfloor
+x 5
+y 5
+end
+arch dirtfloor
+x 5
 y 6
 end
+arch light4
+x 5
+y 7
+end
+arch dirtfloor
+x 5
+y 7
+end
+arch flagstone
+x 5
+y 8
+end
 arch awall_0
-x 3
-y 6
+x 5
+y 8
 end
 arch swall_3_3
-x 3
-y 6
-end
-arch dungeon_magic
-x 3
-y 6
-end
-arch flagstone
-x 3
-y 7
-end
-arch swall_2_1_1
-x 3
-y 7
-end
-arch dungeon_magic
-x 3
-y 7
-end
-arch flagstone
-x 3
-y 8
-end
-arch swall_2_1_1
-x 3
+x 5
 y 8
 end
 arch dungeon_magic
-x 3
+x 5
 y 8
 end
 arch flagstone
-x 3
+x 5
 y 9
 end
 arch swall_2_1_1
-x 3
+x 5
 y 9
 end
 arch dungeon_magic
-x 3
+x 5
 y 9
 end
 arch flagstone
-x 3
+x 5
 y 10
 end
+arch swall_2_1_1
+x 5
+y 10
+end
+arch dungeon_magic
+x 5
+y 10
+end
+arch flagstone
+x 5
+y 11
+end
+arch swall_2_1_1
+x 5
+y 11
+end
+arch dungeon_magic
+x 5
+y 11
+end
+arch flagstone
+x 5
+y 12
+end
 arch swall_1_2_half
-x 3
-y 10
+x 5
+y 12
 end
 arch awall_0
-x 3
-y 10
+x 5
+y 12
 end
 arch dungeon_magic
-x 3
-y 10
+x 5
+y 12
 end
 arch flagstone
-x 3
-y 11
+x 5
+y 13
 no_magic 1
 damned 1
 end
 arch wall_2_1_2
-x 3
-y 11
+x 5
+y 13
 end
 arch dungeon_magic
-x 3
-y 11
+x 5
+y 13
+end
+arch grass_only
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 15
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
 end
 arch dirtfloor
-x 4
+x 6
+y 2
 end
 arch wall_2_1_2
-x 4
+x 6
+y 2
 end
 arch dirtfloor
-x 4
-y 1
+x 6
+y 3
 end
 arch table_3
-x 4
-y 1
+x 6
+y 3
 no_pick 1
 end
 arch saw
-x 4
-y 1
+x 6
+y 3
 no_pick 1
 end
 arch flagstone
-x 4
-y 2
+x 6
+y 4
 end
 arch oilskin
-x 4
-y 2
+x 6
+y 4
 no_pick 1
 identified 1
 startequip 1
 end
 arch flagstone
-x 4
-y 3
+x 6
+y 5
 end
 arch flagstone
-x 4
-y 4
+x 6
+y 6
 end
 arch dirtfloor
-x 4
-y 5
+x 6
+y 7
 end
 arch awall_0
-x 4
-y 5
+x 6
+y 7
 end
 arch flagstone
-x 4
-y 6
+x 6
+y 8
 end
 arch swall_1_3
-x 4
-y 6
+x 6
+y 8
 end
 arch dungeon_magic
-x 4
-y 6
-end
-arch flagstone
-x 4
-y 7
-no_magic 1
-damned 1
-end
-arch fireplace
-x 4
-y 7
-end
-arch flagstone
-x 4
+x 6
 y 8
-no_magic 1
-damned 1
 end
 arch flagstone
-x 4
+x 6
 y 9
 no_magic 1
 damned 1
 end
+arch fireplace
+x 6
+y 9
+end
 arch flagstone
-x 4
+x 6
 y 10
 no_magic 1
 damned 1
 end
+arch flagstone
+x 6
+y 11
+no_magic 1
+damned 1
+end
 arch brazier
-x 4
-y 10
+x 6
+y 11
+end
+arch button_small
+x 6
+y 12
+connected 2
 end
 arch flagstone
-x 4
-y 11
+x 6
+y 12
+no_magic 1
+damned 1
+end
+arch flagstone
+x 6
+y 13
 no_magic 1
 damned 1
 end
 arch wall_1_3
-x 4
-y 11
+x 6
+y 13
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 11
+sp 39
+x 6
+y 14
+end
+arch grass_only
+x 6
+y 14
+end
+arch grass_only
+x 6
+y 15
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
 end
 arch dirtfloor
-x 5
+x 7
+y 2
 end
 arch wall_2_1_2
-x 5
+x 7
+y 2
 end
 arch dirtfloor
-x 5
-y 1
+x 7
+y 3
 end
 arch table_3
-x 5
-y 1
+x 7
+y 3
 no_pick 1
 end
 arch dead_neko
-x 5
-y 1
+x 7
+y 3
 no_pick 1
 end
 arch flagstone
-x 5
-y 2
+x 7
+y 4
 end
 arch a_townsman2
 name Tanning Master
@@ -602,60 +874,60 @@ Neko scarves are the latest rage at court.
 If you don't want to be an apprentice, then read the books!
 endmsg
 exp 1
-x 5
-y 2
+x 7
+y 4
 monster 0
 friendly 1
 stand_still 1
 end
 arch flagstone
-x 5
-y 3
+x 7
+y 5
 end
 arch tanbench
-x 5
-y 3
+x 7
+y 5
 end
 arch flagstone
-x 5
-y 4
+x 7
+y 6
 end
 arch dirtfloor
-x 5
-y 5
+x 7
+y 7
 end
 arch pedestal
-x 5
-y 5
+x 7
+y 7
 invisible 1
 connected 11
 end
 arch flagstone
-x 5
-y 6
+x 7
+y 8
 end
 arch gate_closed_1
-x 5
-y 6
+x 7
+y 8
 connected 11
 no_magic 1
 damned 1
 end
 arch flagstone
-x 5
-y 7
+x 7
+y 9
 no_magic 1
 damned 1
 end
 arch check_floor
 slaying tanner_house1
-x 5
-y 7
+x 7
+y 9
 connected 11
 end
 arch flagstone
-x 5
-y 8
+x 7
+y 10
 no_magic 1
 damned 1
 end
@@ -665,8 +937,8 @@ msg
 You have one day's use of these facilities.
 endmsg
 food 504
-x 5
-y 8
+x 7
+y 10
 speed 1.0
 connected 10
 end
@@ -674,140 +946,205 @@ arch altar_trigger
 name Drop 200 platinum to enter
 slaying money
 food 10000
-x 5
-y 8
+x 7
+y 10
 connected 10
 end
 arch flagstone
-x 5
-y 9
-no_magic 1
-damned 1
-end
-arch flagstone
-x 5
-y 10
-no_magic 1
-damned 1
-end
-arch flagstone
-x 5
+x 7
 y 11
 no_magic 1
 damned 1
 end
-arch oakdoor_2
+arch button_small
+x 7
+y 12
+connected 2
+end
+arch flagstone
+x 7
+y 12
+no_magic 1
+damned 1
+end
+arch button_small
+x 7
+y 13
+connected 2
+end
+arch flagstone
+x 7
+y 13
+no_magic 1
+damned 1
+end
+arch odoorn2_closed_1
+x 7
+y 13
+connected 2
+end
+arch invis_exit
 slaying /world/world_105_115
 hp 11
 sp 39
-x 5
-y 11
+x 7
+y 14
+end
+arch grass_only
+x 7
+y 14
+end
+arch grass_only
+x 7
+y 15
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
+y 1
 end
 arch dirtfloor
-x 6
+x 8
+y 2
 end
 arch wall_2_1_2
-x 6
+x 8
+y 2
 end
 arch dirtfloor
-x 6
-y 1
+x 8
+y 3
 end
 arch table_3
-x 6
-y 1
+x 8
+y 3
 no_pick 1
 end
 arch dagger
-x 6
-y 1
+x 8
+y 3
 no_pick 1
 end
 arch flagstone
-x 6
-y 2
-end
-arch flagstone
-x 6
-y 3
-end
-arch flagstone
-x 6
+x 8
 y 4
 end
-arch dirtfloor
-x 6
+arch flagstone
+x 8
 y 5
 end
+arch flagstone
+x 8
+y 6
+end
+arch dirtfloor
+x 8
+y 7
+end
 arch awall_0
-x 6
-y 5
+x 8
+y 7
 end
 arch flagstone
-x 6
-y 6
+x 8
+y 8
 end
 arch swall_1_4
-x 6
-y 6
+x 8
+y 8
 end
 arch dungeon_magic
-x 6
-y 6
+x 8
+y 8
 end
 arch flagstone
-x 6
-y 7
+x 8
+y 9
 no_magic 1
 damned 1
 end
 arch fireplace
-x 6
-y 7
-end
-arch flagstone
-x 6
-y 8
-end
-arch flagstone
-x 6
+x 8
 y 9
-no_magic 1
-damned 1
 end
 arch flagstone
-x 6
+x 8
 y 10
+end
+arch flagstone
+x 8
+y 11
 no_magic 1
 damned 1
 end
 arch brazier
-x 6
-y 10
+x 8
+y 11
+end
+arch button_small
+x 8
+y 12
+connected 2
 end
 arch flagstone
-x 6
-y 11
+x 8
+y 12
+no_magic 1
+damned 1
+end
+arch flagstone
+x 8
+y 13
 no_magic 1
 damned 1
 end
 arch wall_1_4
-x 6
-y 11
+x 8
+y 13
 end
-arch dirtfloor
-x 7
+arch invis_exit
+slaying /world/world_105_115
+hp 11
+sp 39
+x 8
+y 14
 end
-arch wall_2_1_2
-x 7
+arch grass_only
+x 8
+y 14
 end
-arch dirtfloor
-x 7
+arch grass_only
+x 8
+y 15
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
+arch light2
+x 9
+y 2
+end
+arch dirtfloor
+x 9
+y 2
+end
+arch window_win2
+x 9
+y 2
+end
+arch dirtfloor
+x 9
+y 3
+end
 arch rock
-x 7
-y 1
+x 9
+y 3
 move_block 0
 can_roll 0
 end
@@ -818,182 +1155,208 @@ A cloak of minor protection can be
 manufactured by adding a balm of
 aethereality to a cloak.
 endmsg
-x 7
-y 1
+x 9
+y 3
 no_pick 1
 identified 1
 end
 arch dirtfloor
-x 7
-y 2
-end
-arch dirtfloor
-x 7
-y 3
-end
-arch dirtfloor
-x 7
+x 9
 y 4
 end
-arch dirtfloor
-x 7
+arch light4
+x 9
 y 5
 end
-arch flagstone
-x 7
+arch dirtfloor
+x 9
+y 5
+end
+arch dirtfloor
+x 9
 y 6
 end
+arch light4
+x 9
+y 7
+end
+arch dirtfloor
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
 arch awall_0
-x 7
-y 6
+x 9
+y 8
 end
 arch swall_3_3
-x 7
-y 6
-end
-arch dungeon_magic
-x 7
-y 6
-end
-arch flagstone
-x 7
-y 7
-end
-arch swall_2_1_1
-x 7
-y 7
-end
-arch dungeon_magic
-x 7
-y 7
-end
-arch flagstone
-x 7
-y 8
-end
-arch swall_2_1_1
-x 7
+x 9
 y 8
 end
 arch dungeon_magic
-x 7
+x 9
 y 8
 end
 arch flagstone
-x 7
+x 9
 y 9
 end
 arch swall_2_1_1
-x 7
+x 9
 y 9
 end
 arch dungeon_magic
-x 7
+x 9
 y 9
 end
 arch flagstone
-x 7
+x 9
 y 10
 end
+arch swall_2_1_1
+x 9
+y 10
+end
+arch dungeon_magic
+x 9
+y 10
+end
+arch flagstone
+x 9
+y 11
+end
+arch swall_2_1_1
+x 9
+y 11
+end
+arch dungeon_magic
+x 9
+y 11
+end
+arch flagstone
+x 9
+y 12
+end
 arch swall_1_2_half
-x 7
-y 10
+x 9
+y 12
 end
 arch awall_0
-x 7
-y 10
+x 9
+y 12
 end
 arch dungeon_magic
-x 7
-y 10
+x 9
+y 12
 end
 arch flagstone
-x 7
-y 11
+x 9
+y 13
 no_magic 1
 damned 1
 end
 arch wall_2_1_2
-x 7
-y 11
+x 9
+y 13
 end
 arch dungeon_magic
-x 7
-y 11
+x 9
+y 13
+end
+arch grass_only
+x 9
+y 14
+end
+arch grass_only
+x 9
+y 15
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
 end
 arch dirtfloor
-x 8
+x 10
+y 2
 end
 arch wall_2_1_2
-x 8
+x 10
+y 2
 end
 arch swall_1_1_half
-x 8
-end
-arch dirtfloor
-x 8
-y 1
-end
-arch swall_2_1_1
-x 8
-y 1
-end
-arch dirtfloor
-x 8
-y 2
-end
-arch swall_2_1_1
-x 8
+x 10
 y 2
 end
 arch dirtfloor
-x 8
+x 10
 y 3
 end
 arch swall_2_1_1
-x 8
+x 10
 y 3
 end
 arch dirtfloor
-x 8
+x 10
 y 4
 end
-arch swall_2_2_1
-x 8
-y 4
-end
-arch awall_0
-x 8
+arch swall_2_1_1
+x 10
 y 4
 end
 arch dirtfloor
-x 8
+x 10
+y 5
+end
+arch swall_2_1_1
+x 10
 y 5
 end
 arch dirtfloor
-x 8
+x 10
 y 6
 end
-arch swall_2_1_2
-x 8
+arch swall_2_2_1
+x 10
+y 6
+end
+arch awall_0
+x 10
 y 6
 end
 arch dirtfloor
-x 8
+x 10
 y 7
 end
+arch dirtfloor
+x 10
+y 8
+end
+arch swall_2_1_2
+x 10
+y 8
+end
+arch dirtfloor
+x 10
+y 9
+end
 arch platinum_converter
 name Buy Cloaks (4pp)
 name_pl Buy Cloaks (4pp)
 other_arch cloak
 sp 1
 food 4
-x 8
-y 7
+x 10
+y 9
 end
 arch dirtfloor
-x 8
-y 8
+x 10
+y 10
 end
 arch platinum_converter
 name Buy Gloves (2pp)
@@ -1001,210 +1364,394 @@ name_pl Buy Gloves (2pp)
 other_arch gloves
 sp 1
 food 2
-x 8
-y 8
-end
-arch dirtfloor
-x 8
-y 9
-end
-arch platinum_converter
-x 8
-y 9
-end
-arch dirtfloor
-x 8
+x 10
 y 10
 end
 arch dirtfloor
-x 8
+x 10
 y 11
 end
-arch wall_2_1_2
-x 8
+arch platinum_converter
+x 10
 y 11
 end
 arch dirtfloor
-x 9
+x 10
+y 12
+end
+arch light2
+x 10
+y 13
+end
+arch dirtfloor
+x 10
+y 13
+end
+arch window_win2
+x 10
+y 13
+end
+arch grass_only
+x 10
+y 14
+end
+arch grass_only
+x 10
+y 15
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch dirtfloor
+x 11
+y 2
 end
 arch wall_2_1_2
-x 9
-end
-arch dirtfloor
-x 9
-y 1
-end
-arch neko
-x 9
-y 1
-sleep 0
-end
-arch dirtfloor
-x 9
+x 11
 y 2
 end
-arch neko
-x 9
-y 2
-sleep 0
-end
 arch dirtfloor
-x 9
+x 11
 y 3
 end
+arch neko
+x 11
+y 3
+sleep 0
+end
+arch dirtfloor
+x 11
+y 4
+end
+arch neko
+x 11
+y 4
+sleep 0
+end
+arch dirtfloor
+x 11
+y 5
+end
 arch bones5
-x 9
-y 3
+x 11
+y 5
 end
 arch bones2
-x 9
-y 3
+x 11
+y 5
 end
 arch dirtfloor
-x 9
-y 4
+x 11
+y 6
 end
 arch ggate_closed
-x 9
-y 4
+x 11
+y 6
 no_magic 1
 damned 1
 end
 arch dirtfloor
-x 9
-y 5
+x 11
+y 7
 end
 arch dirtfloor
-x 9
-y 6
+x 11
+y 8
 end
 arch ggate_open
-x 9
-y 6
-end
-arch dirtfloor
-x 9
-y 7
-end
-arch dirtfloor
-x 9
+x 11
 y 8
 end
 arch dirtfloor
-x 9
+x 11
 y 9
 end
-arch dirtfloor
-x 9
+arch light4
+x 11
 y 10
 end
 arch dirtfloor
-x 9
+x 11
+y 10
+end
+arch dirtfloor
+x 11
 y 11
 end
+arch dirtfloor
+x 11
+y 12
+end
+arch dirtfloor
+x 11
+y 13
+end
 arch wall_2_1_2
-x 9
-y 11
+x 11
+y 13
+end
+arch grass_only
+x 11
+y 14
+end
+arch grass_only
+x 11
+y 15
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
 end
 arch dirtfloor
-x 10
+x 12
+y 2
 end
 arch wall_2_2_3
-x 10
-end
-arch dirtfloor
-x 10
-y 1
-end
-arch wall_2_1_1
-x 10
-y 1
-end
-arch dirtfloor
-x 10
-y 2
-end
-arch wall_2_1_1
-x 10
+x 12
 y 2
 end
 arch dirtfloor
-x 10
+x 12
 y 3
 end
 arch wall_2_1_1
-x 10
+x 12
 y 3
 end
-arch dirtfloor
-x 10
-y 4
-end
-arch wall_2_1_1
-x 10
-y 4
-end
-arch swall_1_3_half
-x 10
+arch light2
+x 12
 y 4
 end
 arch dirtfloor
-x 10
+x 12
+y 4
+end
+arch window_win1
+x 12
+y 4
+end
+arch dirtfloor
+x 12
 y 5
 end
 arch wall_2_1_1
-x 10
+x 12
 y 5
 end
 arch dirtfloor
-x 10
+x 12
 y 6
 end
 arch wall_2_1_1
-x 10
+x 12
 y 6
 end
 arch swall_1_3_half
-x 10
+x 12
 y 6
 end
-arch dirtfloor
-x 10
-y 7
-end
-arch wall_2_1_1
-x 10
+arch light2
+x 12
 y 7
 end
 arch dirtfloor
-x 10
+x 12
+y 7
+end
+arch window_win1
+x 12
+y 7
+end
+arch dirtfloor
+x 12
 y 8
 end
 arch wall_2_1_1
-x 10
+x 12
+y 8
+end
+arch swall_1_3_half
+x 12
 y 8
 end
 arch dirtfloor
-x 10
+x 12
 y 9
 end
 arch wall_2_1_1
-x 10
+x 12
 y 9
 end
 arch dirtfloor
-x 10
+x 12
 y 10
 end
 arch wall_2_1_1
-x 10
+x 12
 y 10
 end
 arch dirtfloor
-x 10
+x 12
 y 11
 end
+arch wall_2_1_1
+x 12
+y 11
+end
+arch dirtfloor
+x 12
+y 12
+end
+arch wall_2_1_1
+x 12
+y 12
+end
+arch dirtfloor
+x 12
+y 13
+end
 arch wall_2_2_4
-x 10
+x 12
+y 13
+end
+arch grass_only
+x 12
+y 14
+end
+arch grass_only
+x 12
+y 15
+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
+arch grass_only
+x 13
+y 14
+end
+arch grass_only
+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 grass_only
+x 14
+y 15
+end
diff --git a/world/world_105_115 b/world/world_105_115
index d42ffb825..c9e569ff6 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2011-09-15 Rick Tanner
+Modified: 2011-09-17 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -5196,8 +5196,8 @@ end
 arch house_small
 name Scorn Tannery
 slaying /scorn/houses/tannery
-hp 5
-sp 10
+hp 7
+sp 11
 x 11
 y 39
 end