diff --git a/scorn/misc/mercenaries b/scorn/misc/mercenaries
index e457367e4..1bea44cd0 100644
--- a/scorn/misc/mercenaries
+++ b/scorn/misc/mercenaries
@@ -2,247 +2,460 @@ arch map
 name Mercenaries Agency
 difficulty 1
 region scorn
-width 16
-height 16
-enter_x 15
-enter_y 11
+width 20
+height 20
+enter_x 8
+enter_y 16
 msg
 Created:  1997-04-16
-Modified: 2012-01-12 Rick Tanner
+Modified: 2012-06-30 Rick Tanner
 endmsg
 end
+arch grass_only
+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 grass_only
+y 16
+end
+arch grass_only
+y 17
+end
+arch grass_only
+y 18
+end
 arch cobblestones2
+y 19
+end
+arch grass_only
+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 grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch cobblestones2
+x 1
+y 19
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch cobblestones2
+x 2
+y 2
 end
 arch woodwall_2_2_2
-end
-arch cobblestones2
-y 1
-end
-arch woodwall_2_1_1
-y 1
-end
-arch cobblestones2
-y 2
-end
-arch woodwall_2_1_1
+x 2
 y 2
 end
 arch cobblestones2
+x 2
 y 3
 end
-arch woodwall_3_2
+arch woodwall_2_1_1
+x 2
 y 3
 end
 arch cobblestones2
+x 2
 y 4
 end
 arch woodwall_2_1_1
+x 2
 y 4
 end
 arch cobblestones2
+x 2
 y 5
 end
-arch woodwall_2_1_1
-y 5
-end
-arch cobblestones2
-y 6
-end
-arch woodwall_2_1_1
-y 6
-end
-arch cobblestones2
-y 7
-end
 arch woodwall_3_2
+x 2
+y 5
+end
+arch cobblestones2
+x 2
+y 6
+end
+arch woodwall_2_1_1
+x 2
+y 6
+end
+arch cobblestones2
+x 2
+y 7
+end
+arch woodwall_2_1_1
+x 2
 y 7
 end
 arch cobblestones2
+x 2
 y 8
 end
 arch woodwall_2_1_1
+x 2
 y 8
 end
 arch cobblestones2
+x 2
 y 9
 end
-arch woodwall_2_1_1
+arch woodwall_3_2
+x 2
 y 9
 end
 arch cobblestones2
+x 2
 y 10
 end
 arch woodwall_2_1_1
+x 2
 y 10
 end
 arch cobblestones2
+x 2
 y 11
 end
 arch woodwall_2_1_1
+x 2
 y 11
 end
 arch cobblestones2
+x 2
 y 12
 end
 arch woodwall_2_1_1
+x 2
 y 12
 end
 arch cobblestones2
+x 2
 y 13
 end
 arch woodwall_2_1_1
+x 2
 y 13
 end
 arch cobblestones2
+x 2
 y 14
 end
 arch woodwall_2_1_1
+x 2
 y 14
 end
 arch cobblestones2
+x 2
 y 15
 end
+arch woodwall_2_1_1
+x 2
+y 15
+end
+arch cobblestones2
+x 2
+y 16
+end
+arch woodwall_2_1_1
+x 2
+y 16
+end
+arch cobblestones2
+x 2
+y 17
+end
 arch woodwall_2_2_1
-y 15
+x 2
+y 17
+end
+arch grass_only
+x 2
+y 18
 end
 arch cobblestones2
-x 1
+x 2
+y 19
 end
-arch woodwall_2_1_2
-x 1
+arch grass_only
+x 3
 end
-arch cobblestones2
-x 1
+arch grass_only
+x 3
 y 1
 end
 arch cobblestones2
-x 1
+x 3
 y 2
 end
+arch woodwall_2_1_2
+x 3
+y 2
+end
+arch cobblestones2
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 4
+end
 arch sign
 msg
 Me tough orc.  Me fight for food.  More than one, but less than many food.
 endmsg
-x 1
-y 2
-end
-arch cobblestones2
-x 1
-y 3
-end
-arch woodwall_1_3
-x 1
-y 3
-end
-arch cobblestones2
-x 1
+x 3
 y 4
 end
 arch cobblestones2
-x 1
+x 3
+y 5
+end
+arch woodwall_1_3
+x 3
 y 5
 end
 arch cobblestones2
-x 1
+x 3
 y 6
 end
+arch cobblestones2
+x 3
+y 7
+end
+arch cobblestones2
+x 3
+y 8
+end
 arch bed_1
-x 1
-y 6
-end
-arch cobblestones2
-x 1
-y 7
-end
-arch woodwall_2_1_2
-x 1
-y 7
-end
-arch cobblestones2
-x 1
+x 3
 y 8
 end
 arch cobblestones2
-x 1
+x 3
 y 9
 end
-arch chair_2.4
-x 1
+arch woodwall_2_1_2
+x 3
 y 9
 end
 arch cobblestones2
-x 1
+x 3
 y 10
 end
 arch cobblestones2
-x 1
+x 3
+y 11
+end
+arch chair_2.4
+x 3
 y 11
 end
 arch cobblestones2
-x 1
+x 3
 y 12
 end
 arch cobblestones2
-x 1
-y 13
-end
-arch chair_2.4
-x 1
+x 3
 y 13
 end
 arch cobblestones2
-x 1
+x 3
 y 14
 end
 arch cobblestones2
-x 1
+x 3
 y 15
 end
-arch woodwall_2_1_2
-x 1
+arch chair_2.4
+x 3
 y 15
 end
 arch cobblestones2
-x 2
-end
-arch woodwall_2_1_2
-x 2
+x 3
+y 16
 end
 arch cobblestones2
-x 2
+x 3
+y 17
+end
+arch woodwall_2_1_2
+x 3
+y 17
+end
+arch grass_only
+x 3
+y 18
+end
+arch cobblestones2
+x 3
+y 19
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
 arch cobblestones2
-x 2
+x 4
 y 2
 end
+arch woodwall_2_1_2
+x 4
+y 2
+end
+arch cobblestones2
+x 4
+y 3
+end
+arch cobblestones2
+x 4
+y 4
+end
 arch altar
 food 2
-x 2
-y 2
+x 4
+y 4
 connected 5
 end
 arch cobblestones2
-x 2
-y 3
+x 4
+y 5
 end
 arch grate_closed_1
-x 2
-y 3
+x 4
+y 5
 speed 0.500000
 connected 5
 blocksview 0
 end
 arch angry_floor
-x 2
-y 4
+x 4
+y 6
 speed 0.000000
 last_sp 4
 connected 5
 end
 arch cobblestones2
-x 2
-y 4
+x 4
+y 6
 end
 arch orc
 Str 14
@@ -250,1456 +463,1858 @@ hp 7
 maxhp 7
 dam 2
 ac 10
-x 2
-y 4
+x 4
+y 6
 level 2
 unaggressive 1
 end
 arch cobblestones2
-x 2
-y 5
-end
-arch cobblestones2
-x 2
-y 6
-end
-arch cobblestones2
-x 2
+x 4
 y 7
 end
+arch cobblestones2
+x 4
+y 8
+end
+arch cobblestones2
+x 4
+y 9
+end
 arch woodwall_2_1_2
-x 2
-y 7
+x 4
+y 9
 end
 arch cobblestones2
-x 2
-y 8
+x 4
+y 10
 end
 arch chair_2.1
-x 2
-y 8
+x 4
+y 10
 end
 arch dark_elf
-x 2
-y 8
+x 4
+y 10
 unaggressive 1
 end
 arch cobblestones2
-x 2
-y 9
+x 4
+y 11
 end
 arch table_4
-x 2
-y 9
-end
-arch cobblestones2
-x 2
-y 10
-end
-arch chair_2.3
-x 2
-y 10
-end
-arch cobblestones2
-x 2
+x 4
 y 11
 end
 arch cobblestones2
-x 2
+x 4
 y 12
 end
-arch chair_2.1
-x 2
-y 12
-end
-arch cobblestones2
-x 2
-y 13
-end
-arch table_4
-x 2
-y 13
-end
-arch cobblestones2
-x 2
-y 14
-end
 arch chair_2.3
-x 2
+x 4
+y 12
+end
+arch cobblestones2
+x 4
+y 13
+end
+arch cobblestones2
+x 4
+y 14
+end
+arch chair_2.1
+x 4
 y 14
 end
 arch cobblestones2
-x 2
+x 4
 y 15
 end
-arch woodwall_2_1_2
-x 2
+arch table_4
+x 4
 y 15
 end
 arch cobblestones2
-x 3
+x 4
+y 16
 end
-arch woodwall_2_1_2
-x 3
+arch chair_2.3
+x 4
+y 16
 end
 arch cobblestones2
-x 3
+x 4
+y 17
+end
+arch woodwall_2_1_2
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch cobblestones2
+x 4
+y 19
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
 arch cobblestones2
-x 3
+x 5
+y 2
+end
+arch woodwall_2_1_2
+x 5
 y 2
 end
 arch cobblestones2
-x 3
+x 5
 y 3
 end
+arch cobblestones2
+x 5
+y 4
+end
+arch cobblestones2
+x 5
+y 5
+end
 arch woodwall_1_4
-x 3
-y 3
-end
-arch cobblestones2
-x 3
-y 4
-end
-arch cobblestones2
-x 3
+x 5
 y 5
 end
+arch cobblestones2
+x 5
+y 6
+end
+arch cobblestones2
+x 5
+y 7
+end
 arch table_3
-x 3
-y 5
+x 5
+y 7
 end
 arch cobblestones2
-x 3
-y 6
+x 5
+y 8
 end
 arch chair_2.3
-x 3
-y 6
-end
-arch cobblestones2
-x 3
-y 7
-end
-arch woodwall_2_1_2
-x 3
-y 7
-end
-arch cobblestones2
-x 3
+x 5
 y 8
 end
 arch cobblestones2
-x 3
+x 5
 y 9
 end
+arch woodwall_2_1_2
+x 5
+y 9
+end
+arch cobblestones2
+x 5
+y 10
+end
+arch cobblestones2
+x 5
+y 11
+end
 arch chair_2.2
-x 3
-y 9
+x 5
+y 11
 end
 arch dark_elf
-x 3
-y 9
+x 5
+y 11
 unaggressive 1
 end
 arch cobblestones2
-x 3
-y 10
-end
-arch cobblestones2
-x 3
-y 11
-end
-arch cobblestones2
-x 3
+x 5
 y 12
 end
 arch cobblestones2
-x 3
-y 13
-end
-arch chair_2.2
-x 3
+x 5
 y 13
 end
 arch cobblestones2
-x 3
+x 5
 y 14
 end
 arch cobblestones2
-x 3
+x 5
 y 15
 end
-arch woodwall_2_1_2
-x 3
+arch chair_2.2
+x 5
 y 15
 end
 arch cobblestones2
-x 4
-end
-arch woodwall_2_1_2
-x 4
+x 5
+y 16
 end
 arch cobblestones2
-x 4
+x 5
+y 17
+end
+arch woodwall_2_1_2
+x 5
+y 17
+end
+arch grass_only
+x 5
+y 18
+end
+arch cobblestones2
+x 5
+y 19
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
 y 1
 end
 arch cobblestones2
-x 4
+x 6
+y 2
+end
+arch woodwall_2_1_2
+x 6
 y 2
 end
 arch cobblestones2
-x 4
+x 6
 y 3
 end
+arch cobblestones2
+x 6
+y 4
+end
+arch cobblestones2
+x 6
+y 5
+end
 arch woodwall_3_3
-x 4
-y 3
-end
-arch cobblestones2
-x 4
-y 4
-end
-arch woodwall_2_1_1
-x 4
-y 4
-end
-arch cobblestones2
-x 4
-y 5
-end
-arch woodwall_2_1_1
-x 4
+x 6
 y 5
 end
 arch cobblestones2
-x 4
+x 6
 y 6
 end
 arch woodwall_2_1_1
-x 4
+x 6
 y 6
 end
 arch cobblestones2
-x 4
+x 6
 y 7
 end
+arch woodwall_2_1_1
+x 6
+y 7
+end
+arch cobblestones2
+x 6
+y 8
+end
+arch woodwall_2_1_1
+x 6
+y 8
+end
+arch cobblestones2
+x 6
+y 9
+end
 arch woodwall_3_1
-x 4
-y 7
-end
-arch cobblestones2
-x 4
-y 8
-end
-arch fireplace
-x 4
-y 8
-end
-arch cobblestones2
-x 4
+x 6
 y 9
 end
 arch cobblestones2
-x 4
+x 6
+y 10
+end
+arch fireplace
+x 6
 y 10
 end
 arch cobblestones2
-x 4
+x 6
 y 11
 end
 arch cobblestones2
-x 4
+x 6
 y 12
 end
 arch cobblestones2
-x 4
+x 6
 y 13
 end
 arch cobblestones2
-x 4
+x 6
 y 14
 end
 arch cobblestones2
-x 4
-y 15
-end
-arch woodwall_2_1_2
-x 4
+x 6
 y 15
 end
 arch cobblestones2
-x 5
-end
-arch woodwall_2_1_2
-x 5
+x 6
+y 16
 end
 arch cobblestones2
-x 5
+x 6
+y 17
+end
+arch woodwall_2_1_2
+x 6
+y 17
+end
+arch grass_only
+x 6
+y 18
+end
+arch cobblestones2
+x 6
+y 19
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
 arch cobblestones2
-x 5
+x 7
 y 2
 end
+arch woodwall_2_1_2
+x 7
+y 2
+end
+arch cobblestones2
+x 7
+y 3
+end
+arch cobblestones2
+x 7
+y 4
+end
 arch sign
 msg
 For a small fee, I'll do 'em in good.  Just 60 gold.
 endmsg
-x 5
-y 2
-end
-arch cobblestones2
-x 5
-y 3
-end
-arch woodwall_1_3
-x 5
-y 3
-end
-arch cobblestones2
-x 5
+x 7
 y 4
 end
 arch cobblestones2
-x 5
+x 7
+y 5
+end
+arch woodwall_1_3
+x 7
 y 5
 end
 arch cobblestones2
-x 5
+x 7
 y 6
 end
+arch cobblestones2
+x 7
+y 7
+end
+arch cobblestones2
+x 7
+y 8
+end
 arch bed_1
-x 5
-y 6
-end
-arch cobblestones2
-x 5
-y 7
-end
-arch woodwall_2_1_2
-x 5
-y 7
-end
-arch cobblestones2
-x 5
+x 7
 y 8
 end
 arch cobblestones2
-x 5
+x 7
 y 9
 end
-arch chair_2.4
-x 5
-y 9
-end
-arch warrior_1
-x 5
+arch woodwall_2_1_2
+x 7
 y 9
 end
 arch cobblestones2
-x 5
+x 7
 y 10
 end
 arch cobblestones2
-x 5
+x 7
+y 11
+end
+arch chair_2.4
+x 7
+y 11
+end
+arch warrior_1
+x 7
 y 11
 end
 arch cobblestones2
-x 5
+x 7
 y 12
 end
 arch cobblestones2
-x 5
+x 7
 y 13
 end
 arch cobblestones2
-x 5
+x 7
 y 14
 end
 arch cobblestones2
-x 5
+x 7
 y 15
 end
+arch cobblestones2
+x 7
+y 16
+end
+arch cobblestones2
+x 7
+y 17
+end
 arch woodwall_1_3
-x 5
-y 15
+x 7
+y 17
+end
+arch dungeon_magic
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 18
+move_block all
 end
 arch cobblestones2
-x 6
+x 7
+y 19
 end
-arch woodwall_2_1_2
-x 6
+arch grass_only
+x 8
 end
-arch cobblestones2
-x 6
+arch grass_only
+x 8
 y 1
 end
 arch cobblestones2
-x 6
+x 8
 y 2
 end
+arch woodwall_2_1_2
+x 8
+y 2
+end
+arch cobblestones2
+x 8
+y 3
+end
+arch cobblestones2
+x 8
+y 4
+end
 arch altar
 slaying money
 food 600
-x 6
-y 2
+x 8
+y 4
 connected 4
 end
 arch cobblestones2
-x 6
-y 3
+x 8
+y 5
 end
 arch grate_closed_1
-x 6
-y 3
+x 8
+y 5
 speed 0.500000
 connected 4
 blocksview 0
 end
 arch angry_floor
-x 6
-y 4
+x 8
+y 6
 speed 0.000000
 last_sp 4
 connected 4
 end
 arch cobblestones2
-x 6
-y 4
+x 8
+y 6
 end
 arch ninja_1
-x 6
-y 4
-end
-arch cobblestones2
-x 6
-y 5
-end
-arch cobblestones2
-x 6
+x 8
 y 6
 end
 arch cobblestones2
-x 6
+x 8
 y 7
 end
+arch cobblestones2
+x 8
+y 8
+end
+arch cobblestones2
+x 8
+y 9
+end
 arch woodwall_2_1_2
-x 6
-y 7
+x 8
+y 9
 end
 arch cobblestones2
-x 6
-y 8
+x 8
+y 10
 end
 arch chair_2.1
-x 6
-y 8
+x 8
+y 10
 end
 arch warrior_1
-x 6
-y 8
+x 8
+y 10
 end
 arch cobblestones2
-x 6
-y 9
+x 8
+y 11
 end
 arch table_4
-x 6
-y 9
-end
-arch cobblestones2
-x 6
-y 10
-end
-arch chair_2.3
-x 6
-y 10
-end
-arch cobblestones2
-x 6
+x 8
 y 11
 end
 arch cobblestones2
-x 6
+x 8
+y 12
+end
+arch chair_2.3
+x 8
 y 12
 end
 arch cobblestones2
-x 6
+x 8
 y 13
 end
 arch cobblestones2
-x 6
+x 8
 y 14
 end
 arch cobblestones2
-x 6
+x 8
 y 15
 end
+arch cobblestones2
+x 8
+y 16
+end
+arch cobblestones2
+x 8
+y 17
+end
 arch look_door_exit_1
 slaying /world/world_104_115
 hp 46
 sp 37
-x 6
-y 15
+x 8
+y 17
+end
+arch dungeon_magic
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 18
+move_block all
 end
 arch cobblestones2
-x 7
+x 8
+y 19
 end
-arch woodwall_2_1_2
-x 7
+arch grass_only
+x 9
 end
-arch cobblestones2
-x 7
+arch grass_only
+x 9
 y 1
 end
 arch cobblestones2
-x 7
+x 9
+y 2
+end
+arch woodwall_2_1_2
+x 9
 y 2
 end
 arch cobblestones2
-x 7
-y 3
-end
-arch woodwall_1_4
-x 7
+x 9
 y 3
 end
 arch cobblestones2
-x 7
+x 9
 y 4
 end
 arch cobblestones2
-x 7
+x 9
 y 5
 end
+arch woodwall_1_4
+x 9
+y 5
+end
+arch cobblestones2
+x 9
+y 6
+end
+arch cobblestones2
+x 9
+y 7
+end
 arch table_3
-x 7
-y 5
+x 9
+y 7
 end
 arch cobblestones2
-x 7
-y 6
+x 9
+y 8
 end
 arch chair_2.3
-x 7
-y 6
-end
-arch cobblestones2
-x 7
-y 7
-end
-arch woodwall_2_1_2
-x 7
-y 7
-end
-arch cobblestones2
-x 7
+x 9
 y 8
 end
 arch cobblestones2
-x 7
+x 9
 y 9
 end
-arch chair_2.2
-x 7
+arch woodwall_2_1_2
+x 9
 y 9
 end
 arch cobblestones2
-x 7
+x 9
 y 10
 end
 arch cobblestones2
-x 7
+x 9
+y 11
+end
+arch chair_2.2
+x 9
 y 11
 end
 arch cobblestones2
-x 7
+x 9
 y 12
 end
+arch cobblestones2
+x 9
+y 13
+end
+arch cobblestones2
+x 9
+y 14
+end
 arch sign
 msg
 Welcome to the mercenaries agency.  Look through our selection, and get the bodyguard of your choice.  And remember, when the going gets tough, the tough get money!
 endmsg
-x 7
-y 12
-end
-arch cobblestones2
-x 7
-y 13
-end
-arch cobblestones2
-x 7
+x 9
 y 14
 end
 arch cobblestones2
-x 7
+x 9
 y 15
 end
+arch cobblestones2
+x 9
+y 16
+end
+arch cobblestones2
+x 9
+y 17
+end
 arch woodwall_1_4
-x 7
-y 15
+x 9
+y 17
+end
+arch dungeon_magic
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 18
+move_block all
 end
 arch cobblestones2
-x 8
+x 9
+y 19
 end
-arch woodwall_2_1_2
-x 8
+arch grass_only
+x 10
 end
-arch cobblestones2
-x 8
+arch grass_only
+x 10
 y 1
 end
 arch cobblestones2
-x 8
+x 10
+y 2
+end
+arch woodwall_2_1_2
+x 10
 y 2
 end
 arch cobblestones2
-x 8
+x 10
 y 3
 end
+arch cobblestones2
+x 10
+y 4
+end
+arch cobblestones2
+x 10
+y 5
+end
 arch woodwall_2_2_3
-x 8
-y 3
-end
-arch cobblestones2
-x 8
-y 4
-end
-arch woodwall_2_1_1
-x 8
-y 4
-end
-arch cobblestones2
-x 8
-y 5
-end
-arch woodwall_2_1_1
-x 8
+x 10
 y 5
 end
 arch cobblestones2
-x 8
+x 10
 y 6
 end
 arch woodwall_2_1_1
-x 8
+x 10
 y 6
 end
 arch cobblestones2
-x 8
+x 10
 y 7
 end
+arch woodwall_2_1_1
+x 10
+y 7
+end
+arch cobblestones2
+x 10
+y 8
+end
+arch woodwall_2_1_1
+x 10
+y 8
+end
+arch cobblestones2
+x 10
+y 9
+end
 arch woodwall_3_4
-x 8
-y 7
-end
-arch cobblestones2
-x 8
-y 8
-end
-arch woodwall_2_1_1
-x 8
-y 8
-end
-arch cobblestones2
-x 8
-y 9
-end
-arch woodwall_2_1_1
-x 8
+x 10
 y 9
 end
 arch cobblestones2
-x 8
+x 10
 y 10
 end
 arch woodwall_2_1_1
-x 8
+x 10
 y 10
 end
 arch cobblestones2
-x 8
+x 10
 y 11
 end
 arch woodwall_2_1_1
-x 8
+x 10
 y 11
 end
 arch cobblestones2
-x 8
+x 10
 y 12
 end
-arch woodwall_1_2
-x 8
+arch woodwall_2_1_1
+x 10
 y 12
 end
 arch cobblestones2
-x 8
+x 10
+y 13
+end
+arch woodwall_2_1_1
+x 10
 y 13
 end
 arch cobblestones2
-x 8
+x 10
+y 14
+end
+arch woodwall_1_2
+x 10
 y 14
 end
 arch cobblestones2
-x 8
-y 15
-end
-arch woodwall_2_1_2
-x 8
+x 10
 y 15
 end
 arch cobblestones2
-x 9
-end
-arch woodwall_2_1_2
-x 9
+x 10
+y 16
 end
 arch cobblestones2
-x 9
+x 10
+y 17
+end
+arch woodwall_2_1_2
+x 10
+y 17
+end
+arch grass_only
+x 10
+y 18
+end
+arch cobblestones2
+x 10
+y 19
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch cobblestones2
-x 9
+x 11
+y 2
+end
+arch woodwall_2_1_2
+x 11
 y 2
 end
 arch cobblestones2
-x 9
+x 11
 y 3
 end
 arch cobblestones2
-x 9
+x 11
 y 4
 end
 arch cobblestones2
-x 9
+x 11
 y 5
 end
 arch cobblestones2
-x 9
+x 11
 y 6
 end
 arch cobblestones2
-x 9
+x 11
 y 7
 end
 arch cobblestones2
-x 9
+x 11
 y 8
 end
 arch cobblestones2
-x 9
+x 11
 y 9
 end
 arch cobblestones2
-x 9
+x 11
 y 10
 end
 arch cobblestones2
-x 9
+x 11
 y 11
 end
 arch cobblestones2
-x 9
+x 11
 y 12
 end
 arch cobblestones2
-x 9
+x 11
 y 13
 end
 arch cobblestones2
-x 9
+x 11
 y 14
 end
 arch cobblestones2
-x 9
-y 15
-end
-arch woodwall_2_1_2
-x 9
+x 11
 y 15
 end
 arch cobblestones2
-x 10
-end
-arch woodwall_2_1_2
-x 10
+x 11
+y 16
 end
 arch cobblestones2
-x 10
+x 11
+y 17
+end
+arch woodwall_2_1_2
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch cobblestones2
+x 11
+y 19
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
 y 1
 end
+arch cobblestones2
+x 12
+y 2
+end
+arch woodwall_2_1_2
+x 12
+y 2
+end
+arch cobblestones2
+x 12
+y 3
+end
 arch sign_e
 msg
 I'm a lumberjack and I'm ok.  Just kidding.  I'm tough and nasty and killing's my business.  110 gold.
 endmsg
-x 10
-y 1
+x 12
+y 3
 end
 arch cobblestones2
-x 10
-y 2
+x 12
+y 4
 end
 arch altar
 slaying money
 food 1100
-x 10
-y 2
+x 12
+y 4
 connected 3
 end
 arch cobblestones2
-x 10
-y 3
-end
-arch cobblestones2
-x 10
-y 4
-end
-arch cobblestones2
-x 10
+x 12
 y 5
 end
+arch cobblestones2
+x 12
+y 6
+end
+arch cobblestones2
+x 12
+y 7
+end
 arch sign_e
 msg
 Me fighter.  Kill monsters for you.  80 gold.
 endmsg
-x 10
-y 5
+x 12
+y 7
 end
 arch cobblestones2
-x 10
-y 6
+x 12
+y 8
 end
 arch altar
 slaying money
 food 800
-x 10
-y 6
+x 12
+y 8
 connected 2
 end
 arch cobblestones2
-x 10
-y 7
-end
-arch cobblestones2
-x 10
-y 8
-end
-arch cobblestones2
-x 10
+x 12
 y 9
 end
+arch cobblestones2
+x 12
+y 10
+end
+arch cobblestones2
+x 12
+y 11
+end
 arch sign_e
 msg
 Dark Elf for hire.  I'm fast, mean and good with bows.  100 gold.
 endmsg
-x 10
-y 9
+x 12
+y 11
 end
 arch cobblestones2
-x 10
-y 10
+x 12
+y 12
 end
 arch altar
 slaying money
 food 1000
-x 10
-y 10
+x 12
+y 12
 connected 1
 end
 arch cobblestones2
-x 10
-y 11
-end
-arch cobblestones2
-x 10
-y 12
-end
-arch cobblestones2
-x 10
+x 12
 y 13
 end
 arch cobblestones2
-x 10
+x 12
 y 14
 end
 arch cobblestones2
-x 10
-y 15
-end
-arch woodwall_2_1_2
-x 10
+x 12
 y 15
 end
 arch cobblestones2
-x 11
+x 12
+y 16
+end
+arch cobblestones2
+x 12
+y 17
+end
+arch woodwall_2_1_2
+x 12
+y 17
+end
+arch grass_only
+x 12
+y 18
+end
+arch cobblestones2
+x 12
+y 19
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch cobblestones2
+x 13
+y 2
 end
 arch woodwall_3_3
-x 11
+x 13
+y 2
 end
 arch cobblestones2
-x 11
-y 1
+x 13
+y 3
 end
 arch woodwall_1_2
-x 11
-y 1
+x 13
+y 3
 end
 arch cobblestones2
-x 11
-y 2
+x 13
+y 4
 end
 arch grate_closed_2
-x 11
-y 2
+x 13
+y 4
 connected 3
 blocksview 0
 end
 arch cobblestones2
-x 11
-y 3
+x 13
+y 5
 end
 arch woodwall_1_1
-x 11
-y 3
+x 13
+y 5
 end
 arch cobblestones2
-x 11
-y 4
+x 13
+y 6
 end
 arch woodwall_3_2
-x 11
-y 4
+x 13
+y 6
 end
 arch cobblestones2
-x 11
-y 5
+x 13
+y 7
 end
 arch woodwall_1_2
-x 11
-y 5
+x 13
+y 7
 end
 arch cobblestones2
-x 11
-y 6
+x 13
+y 8
 end
 arch grate_closed_2
-x 11
-y 6
+x 13
+y 8
 connected 2
 blocksview 0
 end
 arch cobblestones2
-x 11
-y 7
+x 13
+y 9
 end
 arch woodwall_1_1
-x 11
-y 7
+x 13
+y 9
 end
 arch cobblestones2
-x 11
-y 8
+x 13
+y 10
 end
 arch woodwall_3_2
-x 11
-y 8
+x 13
+y 10
 end
 arch cobblestones2
-x 11
-y 9
+x 13
+y 11
 end
 arch woodwall_1_2
-x 11
-y 9
+x 13
+y 11
 end
 arch cobblestones2
-x 11
-y 10
+x 13
+y 12
 end
 arch grate_closed_2
-x 11
-y 10
+x 13
+y 12
 connected 1
 blocksview 0
 end
 arch cobblestones2
-x 11
-y 11
+x 13
+y 13
 end
 arch woodwall_1_1
-x 11
-y 11
+x 13
+y 13
 end
 arch cobblestones2
-x 11
-y 12
+x 13
+y 14
 end
 arch woodwall_2_2_1
-x 11
-y 12
+x 13
+y 14
 end
 arch swall_1_1_half
-x 11
-y 12
+x 13
+y 14
 end
 arch cobblestones2
-x 11
-y 13
+x 13
+y 15
 end
 arch swall_2_1_1
-x 11
-y 13
+x 13
+y 15
 end
 arch cobblestones2
-x 11
-y 14
+x 13
+y 16
 end
 arch swall_1_2_half
-x 11
-y 14
+x 13
+y 16
 end
 arch woodwall_1_1
-x 11
-y 14
+x 13
+y 16
 end
 arch cobblestones2
-x 11
-y 15
+x 13
+y 17
 end
 arch woodwall_2_2_4
-x 11
-y 15
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 18
 end
 arch cobblestones2
-x 12
+x 13
+y 19
 end
-arch woodwall_2_1_2
-x 12
+arch grass_only
+x 14
 end
-arch cobblestones2
-x 12
+arch grass_only
+x 14
 y 1
 end
-arch angry_floor
-x 12
+arch cobblestones2
+x 14
 y 2
+end
+arch woodwall_2_1_2
+x 14
+y 2
+end
+arch cobblestones2
+x 14
+y 3
+end
+arch angry_floor
+x 14
+y 4
 speed 0.000000
 last_sp 4
 connected 3
 end
 arch cobblestones2
-x 12
-y 2
+x 14
+y 4
 end
 arch warrior_1
-x 12
-y 2
-end
-arch cobblestones2
-x 12
-y 3
-end
-arch cobblestones2
-x 12
-y 4
-end
-arch woodwall_2_1_2
-x 12
+x 14
 y 4
 end
 arch cobblestones2
-x 12
+x 14
 y 5
 end
-arch angry_floor
-x 12
+arch cobblestones2
+x 14
 y 6
+end
+arch woodwall_2_1_2
+x 14
+y 6
+end
+arch cobblestones2
+x 14
+y 7
+end
+arch angry_floor
+x 14
+y 8
 speed 0.000000
 last_sp 4
 connected 2
 end
 arch cobblestones2
-x 12
-y 6
+x 14
+y 8
 end
 arch fighter
-x 12
-y 6
-end
-arch cobblestones2
-x 12
-y 7
-end
-arch cobblestones2
-x 12
-y 8
-end
-arch woodwall_2_1_2
-x 12
+x 14
 y 8
 end
 arch cobblestones2
-x 12
+x 14
 y 9
 end
-arch angry_floor
-x 12
+arch cobblestones2
+x 14
 y 10
+end
+arch woodwall_2_1_2
+x 14
+y 10
+end
+arch cobblestones2
+x 14
+y 11
+end
+arch angry_floor
+x 14
+y 12
 speed 0.000000
 last_sp 4
 connected 1
 end
 arch cobblestones2
-x 12
-y 10
+x 14
+y 12
 end
 arch dark_elf
-x 12
-y 10
+x 14
+y 12
 unaggressive 1
 end
 arch cobblestones2
-x 12
-y 11
-end
-arch cobblestones2
-x 12
-y 12
-end
-arch woodwall_2_1_2
-x 12
-y 12
-end
-arch grass
-x 12
+x 14
 y 13
 end
-arch grass
-x 12
+arch cobblestones2
+x 14
+y 14
+end
+arch woodwall_2_1_2
+x 14
 y 14
 end
 arch grass
-x 12
+x 14
 y 15
 end
-arch tree5
-x 12
-y 15
-end
-arch cobblestones2
-x 13
-end
-arch woodwall_2_1_2
-x 13
-end
-arch cobblestones2
-x 13
-y 1
-end
-arch cobblestones2
-x 13
-y 2
-end
-arch cobblestones2
-x 13
-y 3
-end
-arch table_2
-x 13
-y 3
-end
-arch cobblestones2
-x 13
-y 4
-end
-arch woodwall_2_1_2
-x 13
-y 4
-end
-arch cobblestones2
-x 13
-y 5
-end
-arch cobblestones2
-x 13
-y 6
-end
-arch cobblestones2
-x 13
-y 7
-end
-arch table_2
-x 13
-y 7
-end
-arch cobblestones2
-x 13
-y 8
-end
-arch woodwall_2_1_2
-x 13
-y 8
-end
-arch cobblestones2
-x 13
-y 9
-end
-arch cobblestones2
-x 13
-y 10
-end
-arch cobblestones2
-x 13
-y 11
-end
-arch table_2
-x 13
-y 11
-end
-arch cobblestones2
-x 13
-y 12
-end
-arch woodwall_2_1_2
-x 13
-y 12
-end
 arch grass
-x 13
-y 13
-end
-arch tree5
-x 13
-y 13
-end
-arch grass
-x 13
-y 14
-end
-arch grass
-x 13
-y 15
-end
-arch cobblestones2
 x 14
-end
-arch woodwall_2_1_2
-x 14
-end
-arch cobblestones2
-x 14
-y 1
-end
-arch bed_1
-x 14
-y 1
-end
-arch cobblestones2
-x 14
-y 2
-end
-arch cobblestones2
-x 14
-y 3
-end
-arch chair_2.2
-x 14
-y 3
-end
-arch cobblestones2
-x 14
-y 4
-end
-arch woodwall_2_1_2
-x 14
-y 4
-end
-arch cobblestones2
-x 14
-y 5
-end
-arch bed_1
-x 14
-y 5
-end
-arch cobblestones2
-x 14
-y 6
-end
-arch cobblestones2
-x 14
-y 7
-end
-arch chair_2.2
-x 14
-y 7
-end
-arch cobblestones2
-x 14
-y 8
-end
-arch woodwall_2_1_2
-x 14
-y 8
-end
-arch cobblestones2
-x 14
-y 9
-end
-arch bed_1
-x 14
-y 9
-end
-arch cobblestones2
-x 14
-y 10
-end
-arch cobblestones2
-x 14
-y 11
-end
-arch chair_2.2
-x 14
-y 11
-end
-arch cobblestones2
-x 14
-y 12
-end
-arch woodwall_2_1_2
-x 14
-y 12
+y 16
 end
 arch grass
 x 14
-y 13
-end
-arch grass
-x 14
-y 14
+y 17
 end
 arch tree5
 x 14
-y 14
+y 17
 end
-arch grass
+arch grass_only
 x 14
-y 15
+y 18
+end
+arch cobblestones2
+x 14
+y 19
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
 end
 arch cobblestones2
 x 15
+y 2
+end
+arch woodwall_2_1_2
+x 15
+y 2
+end
+arch cobblestones2
+x 15
+y 3
+end
+arch cobblestones2
+x 15
+y 4
+end
+arch cobblestones2
+x 15
+y 5
+end
+arch table_2
+x 15
+y 5
+end
+arch cobblestones2
+x 15
+y 6
+end
+arch woodwall_2_1_2
+x 15
+y 6
+end
+arch cobblestones2
+x 15
+y 7
+end
+arch cobblestones2
+x 15
+y 8
+end
+arch cobblestones2
+x 15
+y 9
+end
+arch table_2
+x 15
+y 9
+end
+arch cobblestones2
+x 15
+y 10
+end
+arch woodwall_2_1_2
+x 15
+y 10
+end
+arch cobblestones2
+x 15
+y 11
+end
+arch cobblestones2
+x 15
+y 12
+end
+arch cobblestones2
+x 15
+y 13
+end
+arch table_2
+x 15
+y 13
+end
+arch cobblestones2
+x 15
+y 14
+end
+arch woodwall_2_1_2
+x 15
+y 14
+end
+arch grass
+x 15
+y 15
+end
+arch tree5
+x 15
+y 15
+end
+arch grass
+x 15
+y 16
+end
+arch grass
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch cobblestones2
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch cobblestones2
+x 16
+y 2
+end
+arch woodwall_2_1_2
+x 16
+y 2
+end
+arch cobblestones2
+x 16
+y 3
+end
+arch bed_1
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch chair_2.2
+x 16
+y 5
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch woodwall_2_1_2
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 7
+end
+arch bed_1
+x 16
+y 7
+end
+arch cobblestones2
+x 16
+y 8
+end
+arch cobblestones2
+x 16
+y 9
+end
+arch chair_2.2
+x 16
+y 9
+end
+arch cobblestones2
+x 16
+y 10
+end
+arch woodwall_2_1_2
+x 16
+y 10
+end
+arch cobblestones2
+x 16
+y 11
+end
+arch bed_1
+x 16
+y 11
+end
+arch cobblestones2
+x 16
+y 12
+end
+arch cobblestones2
+x 16
+y 13
+end
+arch chair_2.2
+x 16
+y 13
+end
+arch cobblestones2
+x 16
+y 14
+end
+arch woodwall_2_1_2
+x 16
+y 14
+end
+arch grass
+x 16
+y 15
+end
+arch grass
+x 16
+y 16
+end
+arch tree5
+x 16
+y 16
+end
+arch grass
+x 16
+y 17
+end
+arch grass_only
+x 16
+y 18
+end
+arch cobblestones2
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch cobblestones2
+x 17
+y 2
 end
 arch woodwall_2_2_3
-x 15
-end
-arch cobblestones2
-x 15
-y 1
-end
-arch woodwall_2_1_1
-x 15
-y 1
-end
-arch cobblestones2
-x 15
-y 2
-end
-arch woodwall_2_1_1
-x 15
+x 17
 y 2
 end
 arch cobblestones2
-x 15
+x 17
 y 3
 end
 arch woodwall_2_1_1
-x 15
+x 17
 y 3
 end
 arch cobblestones2
-x 15
+x 17
 y 4
 end
-arch woodwall_3_4
-x 15
+arch woodwall_2_1_1
+x 17
 y 4
 end
 arch cobblestones2
-x 15
+x 17
 y 5
 end
 arch woodwall_2_1_1
-x 15
+x 17
 y 5
 end
 arch cobblestones2
-x 15
+x 17
 y 6
 end
-arch woodwall_2_1_1
-x 15
-y 6
-end
-arch cobblestones2
-x 15
-y 7
-end
-arch woodwall_2_1_1
-x 15
-y 7
-end
-arch cobblestones2
-x 15
-y 8
-end
 arch woodwall_3_4
-x 15
+x 17
+y 6
+end
+arch cobblestones2
+x 17
+y 7
+end
+arch woodwall_2_1_1
+x 17
+y 7
+end
+arch cobblestones2
+x 17
+y 8
+end
+arch woodwall_2_1_1
+x 17
 y 8
 end
 arch cobblestones2
-x 15
+x 17
 y 9
 end
 arch woodwall_2_1_1
-x 15
+x 17
 y 9
 end
 arch cobblestones2
-x 15
+x 17
 y 10
 end
-arch woodwall_2_1_1
-x 15
+arch woodwall_3_4
+x 17
 y 10
 end
 arch cobblestones2
-x 15
+x 17
 y 11
 end
 arch woodwall_2_1_1
-x 15
+x 17
 y 11
 end
 arch cobblestones2
-x 15
+x 17
 y 12
 end
-arch woodwall_2_2_4
-x 15
+arch woodwall_2_1_1
+x 17
 y 12
 end
-arch grass
-x 15
+arch cobblestones2
+x 17
 y 13
 end
-arch grass
-x 15
+arch woodwall_2_1_1
+x 17
+y 13
+end
+arch cobblestones2
+x 17
+y 14
+end
+arch woodwall_2_2_4
+x 17
 y 14
 end
 arch grass
-x 15
+x 17
 y 15
 end
+arch grass
+x 17
+y 16
+end
+arch grass
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch cobblestones2
+x 17
+y 19
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch grass_only
+x 18
+y 2
+end
+arch grass_only
+x 18
+y 3
+end
+arch grass_only
+x 18
+y 4
+end
+arch grass_only
+x 18
+y 5
+end
+arch grass_only
+x 18
+y 6
+end
+arch grass_only
+x 18
+y 7
+end
+arch grass_only
+x 18
+y 8
+end
+arch grass_only
+x 18
+y 9
+end
+arch grass_only
+x 18
+y 10
+end
+arch grass_only
+x 18
+y 11
+end
+arch grass_only
+x 18
+y 12
+end
+arch grass_only
+x 18
+y 13
+end
+arch grass_only
+x 18
+y 14
+end
+arch grass_only
+x 18
+y 15
+end
+arch grass_only
+x 18
+y 16
+end
+arch grass_only
+x 18
+y 17
+end
+arch grass_only
+x 18
+y 18
+end
+arch cobblestones2
+x 18
+y 19
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch grass_only
+x 19
+y 3
+end
+arch grass_only
+x 19
+y 4
+end
+arch grass_only
+x 19
+y 5
+end
+arch grass_only
+x 19
+y 6
+end
+arch grass_only
+x 19
+y 7
+end
+arch grass_only
+x 19
+y 8
+end
+arch grass_only
+x 19
+y 9
+end
+arch grass_only
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch grass_only
+x 19
+y 12
+end
+arch grass_only
+x 19
+y 13
+end
+arch grass_only
+x 19
+y 14
+end
+arch grass_only
+x 19
+y 15
+end
+arch grass_only
+x 19
+y 16
+end
+arch grass_only
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch cobblestones2
+x 19
+y 19
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 3bc11d343..7d1927b79 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2012-06-28 Rick Tanner
+Modified: 2012-06-30 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -13734,8 +13734,8 @@ end
 arch barrack_up
 name Mercenaries Agency
 slaying /scorn/misc/mercenaries
-hp 6
-sp 15
+hp 8
+sp 16
 x 46
 y 36
 end