diff --git a/marksel/keep b/marksel/keep
index 744c3480c..5ae881b7e 100644
--- a/marksel/keep
+++ b/marksel/keep
@@ -2,676 +2,970 @@ arch map
 name Marksel Keep
 difficulty 8
 region marksel
-width 15
-height 15
-enter_x 7
-enter_y 14
+width 19
+height 19
+enter_x 9
+enter_y 15
 msg
 Created:  1999-01-28 King Zoobus
-Modified: 2012-02-10 Rick Tanner
+Modified: 2012-06-16 Rick Tanner
 endmsg
 end
+arch steppe
+end
+arch steppe
+y 1
+end
+arch steppe
+y 2
+end
+arch steppe
+y 3
+end
+arch steppe
+y 4
+end
+arch steppe
+y 5
+end
+arch steppe
+y 6
+end
+arch steppe
+y 7
+end
+arch steppe
+y 8
+end
+arch steppe
+y 9
+end
+arch steppe
+y 10
+end
+arch steppe
+y 11
+end
+arch steppe
+y 12
+end
+arch steppe
+y 13
+end
+arch steppe
+y 14
+end
+arch steppe
+y 15
+end
+arch steppe
+y 16
+end
+arch steppe
+y 17
+end
+arch steppe
+y 18
+end
+arch steppe
+x 1
+end
+arch steppe
+x 1
+y 1
+end
+arch steppe
+x 1
+y 2
+end
+arch steppe
+x 1
+y 3
+end
+arch steppe
+x 1
+y 4
+end
+arch steppe
+x 1
+y 5
+end
+arch steppe
+x 1
+y 6
+end
+arch steppe
+x 1
+y 7
+end
+arch steppe
+x 1
+y 8
+end
+arch steppe
+x 1
+y 9
+end
+arch steppe
+x 1
+y 10
+end
+arch steppe
+x 1
+y 11
+end
+arch steppe
+x 1
+y 12
+end
+arch steppe
+x 1
+y 13
+end
+arch steppe
+x 1
+y 14
+end
+arch steppe
+x 1
+y 15
+end
+arch steppe
+x 1
+y 16
+end
+arch steppe
+x 1
+y 17
+end
+arch steppe
+x 1
+y 18
+end
+arch steppe
+x 2
+end
+arch steppe
+x 2
+y 1
+end
 arch flagstone
+x 2
+y 2
 end
 arch flagstone_2_2_2
-end
-arch flagstone
-y 1
-end
-arch flagstone_2_1_1
-y 1
-end
-arch flagstone
-y 2
-end
-arch flagstone_2_1_1
+x 2
 y 2
 end
 arch flagstone
+x 2
 y 3
 end
 arch flagstone_2_1_1
+x 2
 y 3
 end
 arch flagstone
+x 2
 y 4
 end
 arch flagstone_2_1_1
+x 2
 y 4
 end
 arch flagstone
+x 2
 y 5
 end
 arch flagstone_2_1_1
+x 2
 y 5
 end
 arch flagstone
+x 2
 y 6
 end
+arch flagstone_2_1_1
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 7
+end
+arch flagstone_2_1_1
+x 2
+y 7
+end
+arch flagstone
+x 2
+y 8
+end
 arch flagstone_3_2
-y 6
-end
-arch flagstone
-y 7
-end
-arch flagstone_2_1_1
-y 7
-end
-arch flagstone
-y 8
-end
-arch flagstone_2_1_1
+x 2
 y 8
 end
 arch flagstone
+x 2
 y 9
 end
 arch flagstone_2_1_1
+x 2
 y 9
 end
 arch flagstone
+x 2
 y 10
 end
 arch flagstone_2_1_1
+x 2
 y 10
 end
 arch flagstone
+x 2
 y 11
 end
 arch flagstone_2_1_1
+x 2
 y 11
 end
 arch flagstone
+x 2
 y 12
 end
 arch flagstone_2_1_1
+x 2
 y 12
 end
 arch flagstone
+x 2
 y 13
 end
 arch flagstone_2_1_1
+x 2
 y 13
 end
 arch flagstone
+x 2
 y 14
 end
+arch flagstone_2_1_1
+x 2
+y 14
+end
+arch flagstone
+x 2
+y 15
+end
+arch flagstone_2_1_1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
 arch flagstone_2_2_1
-y 14
+x 2
+y 16
 end
-arch flagstone
-x 1
+arch steppe
+x 2
+y 17
 end
-arch flagstone_2_1_2
-x 1
+arch steppe
+x 2
+y 18
 end
-arch flagstone
-x 1
+arch steppe
+x 3
+end
+arch steppe
+x 3
 y 1
 end
 arch flagstone
-x 1
+x 3
+y 2
+end
+arch flagstone_2_1_2
+x 3
 y 2
 end
 arch flagstone
-x 1
+x 3
 y 3
 end
 arch flagstone
-x 1
+x 3
 y 4
 end
 arch flagstone
-x 1
+x 3
 y 5
 end
 arch flagstone
-x 1
-y 6
-end
-arch flagstone_1_3
-x 1
+x 3
 y 6
 end
 arch flagstone
-x 1
+x 3
 y 7
 end
 arch flagstone
-x 1
+x 3
 y 8
 end
-arch torch_1
-x 1
+arch flagstone_1_3
+x 3
 y 8
 end
 arch flagstone
-x 1
+x 3
 y 9
 end
 arch flagstone
-x 1
+x 3
+y 10
+end
+arch torch_1
+x 3
 y 10
 end
 arch flagstone
-x 1
+x 3
 y 11
 end
 arch flagstone
-x 1
-y 12
-end
-arch torch_1
-x 1
+x 3
 y 12
 end
 arch flagstone
-x 1
+x 3
 y 13
 end
 arch flagstone
-x 1
+x 3
 y 14
 end
-arch flagstone_2_1_2
-x 1
+arch torch_1
+x 3
 y 14
 end
 arch flagstone
-x 2
-end
-arch flagstone_2_1_2
-x 2
+x 3
+y 15
 end
 arch flagstone
-x 2
+x 3
+y 16
+end
+arch flagstone_2_1_2
+x 3
+y 16
+end
+arch steppe
+x 3
+y 17
+end
+arch steppe
+x 3
+y 18
+end
+arch steppe
+x 4
+end
+arch steppe
+x 4
 y 1
 end
+arch flagstone
+x 4
+y 2
+end
+arch flagstone_2_1_2
+x 4
+y 2
+end
+arch flagstone
+x 4
+y 3
+end
 arch clock
-x 2
-y 1
-end
-arch flagstone
-x 2
-y 2
-end
-arch table_3
-x 2
-y 2
-end
-arch flagstone
-x 2
+x 4
 y 3
 end
 arch flagstone
-x 2
+x 4
 y 4
 end
+arch table_3
+x 4
+y 4
+end
+arch flagstone
+x 4
+y 5
+end
+arch flagstone
+x 4
+y 6
+end
 arch woman
 msg
 @match *
 The Royal Apartments are upstairs.  You don't need to go up there.
 endmsg
-x 2
-y 4
-end
-arch flagstone
-x 2
-y 5
-end
-arch flagstone
-x 2
+x 4
 y 6
 end
+arch flagstone
+x 4
+y 7
+end
+arch flagstone
+x 4
+y 8
+end
 arch door_look_1
-x 2
-y 6
-end
-arch flagstone
-x 2
-y 7
-end
-arch flagstone
-x 2
+x 4
 y 8
 end
 arch flagstone
-x 2
-y 9
-end
-arch chair_1.4
-x 2
+x 4
 y 9
 end
 arch flagstone
-x 2
+x 4
 y 10
 end
 arch flagstone
-x 2
+x 4
 y 11
 end
 arch chair_1.4
-x 2
+x 4
 y 11
 end
 arch flagstone
-x 2
+x 4
 y 12
 end
 arch flagstone
-x 2
+x 4
+y 13
+end
+arch chair_1.4
+x 4
 y 13
 end
 arch flagstone
-x 2
-y 14
-end
-arch flagstone_2_1_2
-x 2
+x 4
 y 14
 end
 arch flagstone
-x 3
-end
-arch flagstone_2_1_2
-x 3
+x 4
+y 15
 end
 arch flagstone
-x 3
+x 4
+y 16
+end
+arch flagstone_2_1_2
+x 4
+y 16
+end
+arch steppe
+x 4
+y 17
+end
+arch steppe
+x 4
+y 18
+end
+arch steppe
+x 5
+end
+arch steppe
+x 5
 y 1
 end
 arch flagstone
-x 3
+x 5
+y 2
+end
+arch flagstone_2_1_2
+x 5
 y 2
 end
 arch flagstone
-x 3
+x 5
 y 3
 end
 arch flagstone
-x 3
+x 5
 y 4
 end
 arch flagstone
-x 3
+x 5
 y 5
 end
+arch flagstone
+x 5
+y 6
+end
+arch flagstone
+x 5
+y 7
+end
 arch stair_up_2
-x 3
-y 5
+x 5
+y 7
 end
 arch flagstone
-x 3
-y 6
+x 5
+y 8
 end
 arch flagstone_1_4
-x 3
-y 6
-end
-arch flagstone
-x 3
-y 7
-end
-arch flagstone
-x 3
+x 5
 y 8
 end
+arch flagstone
+x 5
+y 9
+end
+arch flagstone
+x 5
+y 10
+end
 arch chair_1.1
-x 3
-y 8
+x 5
+y 10
 end
 arch flagstone
-x 3
-y 9
+x 5
+y 11
 end
 arch table_4
-x 3
-y 9
+x 5
+y 11
 end
 arch flagstone
-x 3
-y 10
+x 5
+y 12
 end
 arch a_guard_m
-x 3
-y 10
+x 5
+y 12
 end
 arch flagstone
-x 3
-y 11
+x 5
+y 13
 end
 arch table_4
-x 3
-y 11
+x 5
+y 13
 end
 arch flagstone
-x 3
-y 12
+x 5
+y 14
 end
 arch chair_1.3
-x 3
-y 12
-end
-arch flagstone
-x 3
-y 13
-end
-arch flagstone
-x 3
+x 5
 y 14
 end
+arch flagstone
+x 5
+y 15
+end
+arch flagstone
+x 5
+y 16
+end
 arch flagstone_2_1_2
-x 3
-y 14
+x 5
+y 16
+end
+arch steppe
+x 5
+y 17
+end
+arch steppe
+x 5
+y 18
+end
+arch steppe
+x 6
+end
+arch steppe
+x 6
+y 1
 end
 arch flagstone
-x 4
+x 6
+y 2
 end
 arch flagstone_3_3
-x 4
-end
-arch flagstone
-x 4
-y 1
-end
-arch flagstone_2_1_1
-x 4
-y 1
-end
-arch flagstone
-x 4
-y 2
-end
-arch flagstone_2_1_1
-x 4
+x 6
 y 2
 end
 arch flagstone
-x 4
+x 6
 y 3
 end
 arch flagstone_2_1_1
-x 4
+x 6
 y 3
 end
 arch flagstone
-x 4
+x 6
 y 4
 end
+arch flagstone_2_1_1
+x 6
+y 4
+end
+arch flagstone
+x 6
+y 5
+end
+arch flagstone_2_1_1
+x 6
+y 5
+end
+arch flagstone
+x 6
+y 6
+end
 arch flagstone_3_2
-x 4
-y 4
+x 6
+y 6
 end
 arch flagstone
-x 4
-y 5
+x 6
+y 7
 end
 arch flagstone_2_1_1
-x 4
-y 5
+x 6
+y 7
 end
 arch flagstone
-x 4
-y 6
+x 6
+y 8
 end
 arch flagstone_2_2_4
-x 4
-y 6
-end
-arch flagstone
-x 4
-y 7
-end
-arch flagstone
-x 4
+x 6
 y 8
 end
+arch flagstone
+x 6
+y 9
+end
+arch flagstone
+x 6
+y 10
+end
 arch warrior_1
-x 4
-y 8
-end
-arch flagstone
-x 4
-y 9
-end
-arch chair_1.2
-x 4
-y 9
-end
-arch flagstone
-x 4
+x 6
 y 10
 end
 arch flagstone
-x 4
+x 6
 y 11
 end
 arch chair_1.2
-x 4
+x 6
 y 11
 end
 arch flagstone
-x 4
+x 6
 y 12
 end
 arch flagstone
-x 4
+x 6
+y 13
+end
+arch chair_1.2
+x 6
 y 13
 end
 arch flagstone
-x 4
-y 14
-end
-arch flagstone_2_1_2
-x 4
+x 6
 y 14
 end
 arch flagstone
-x 5
-end
-arch flagstone_2_1_2
-x 5
+x 6
+y 15
 end
 arch flagstone
-x 5
+x 6
+y 16
+end
+arch flagstone_2_1_2
+x 6
+y 16
+end
+arch steppe
+x 6
+y 17
+end
+arch steppe
+x 6
+y 18
+end
+arch steppe
+x 7
+end
+arch steppe
+x 7
 y 1
 end
+arch flagstone
+x 7
+y 2
+end
+arch flagstone_2_1_2
+x 7
+y 2
+end
+arch flagstone
+x 7
+y 3
+end
 arch chest
-x 5
-y 1
+x 7
+y 3
 end
 arch rune_large_fireball
-x 5
-y 1
-end
-arch flagstone
-x 5
-y 2
-end
-arch flagstone
-x 5
+x 7
 y 3
 end
+arch flagstone
+x 7
+y 4
+end
+arch flagstone
+x 7
+y 5
+end
 arch crown
-x 5
-y 3
+x 7
+y 5
 end
 arch flagstone
-x 5
-y 4
+x 7
+y 6
 end
 arch flagstone_2_1_2
-x 5
-y 4
+x 7
+y 6
 end
 arch flagstone
-x 5
-y 5
+x 7
+y 7
 end
 arch fireplace
-x 5
-y 5
-end
-arch flagstone
-x 5
-y 6
-end
-arch flagstone
-x 5
+x 7
 y 7
 end
 arch flagstone
-x 5
-y 8
-end
-arch cwall_0
-x 5
+x 7
 y 8
 end
 arch flagstone
-x 5
+x 7
 y 9
 end
 arch flagstone
-x 5
+x 7
+y 10
+end
+arch cwall_0
+x 7
 y 10
 end
 arch flagstone
-x 5
-y 11
-end
-arch cwall_0
-x 5
+x 7
 y 11
 end
 arch flagstone
-x 5
+x 7
 y 12
 end
 arch flagstone
-x 5
+x 7
+y 13
+end
+arch cwall_0
+x 7
 y 13
 end
 arch flagstone
-x 5
-y 14
-end
-arch flagstone_2_1_2
-x 5
+x 7
 y 14
 end
 arch flagstone
-x 6
-end
-arch flagstone_2_1_2
-x 6
+x 7
+y 15
 end
 arch flagstone
-x 6
+x 7
+y 16
+end
+arch flagstone_2_1_2
+x 7
+y 16
+end
+arch steppe
+x 7
+y 17
+end
+arch steppe
+x 7
+y 18
+end
+arch steppe
+x 8
+end
+arch steppe
+x 8
 y 1
 end
 arch flagstone
-x 6
+x 8
 y 2
 end
+arch flagstone_2_1_2
+x 8
+y 2
+end
+arch flagstone
+x 8
+y 3
+end
+arch flagstone
+x 8
+y 4
+end
 arch longtable_1_4
-x 6
-y 2
-end
-arch flagstone
-x 6
-y 3
-end
-arch flagstone
-x 6
+x 8
 y 4
 end
+arch flagstone
+x 8
+y 5
+end
+arch flagstone
+x 8
+y 6
+end
 arch flagstone_1_3
-x 6
-y 4
-end
-arch flagstone
-x 6
-y 5
-end
-arch guard
-x 6
-y 5
-end
-arch flagstone
-x 6
+x 8
 y 6
 end
 arch flagstone
-x 6
+x 8
+y 7
+end
+arch guard
+x 8
 y 7
 end
 arch flagstone
-x 6
+x 8
 y 8
 end
 arch flagstone
-x 6
+x 8
 y 9
 end
 arch flagstone
-x 6
+x 8
 y 10
 end
 arch flagstone
-x 6
+x 8
 y 11
 end
 arch flagstone
-x 6
+x 8
 y 12
 end
 arch flagstone
-x 6
+x 8
 y 13
 end
 arch flagstone
-x 6
+x 8
 y 14
 end
+arch flagstone
+x 8
+y 15
+end
+arch flagstone
+x 8
+y 16
+end
 arch flagstone_1_3
-x 6
-y 14
+x 8
+y 16
+end
+arch dungeon_magic
+x 8
+y 17
+end
+arch steppe
+x 8
+y 17
+move_block all
+end
+arch steppe
+x 8
+y 18
+end
+arch steppe
+x 9
+end
+arch steppe
+x 9
+y 1
 end
 arch flagstone
-x 7
+x 9
+y 2
 end
 arch flagstone_2_1_2
-x 7
+x 9
+y 2
 end
 arch flagstone
-x 7
-y 1
+x 9
+y 3
 end
 arch random_shield
-x 7
-y 1
+x 9
+y 3
 end
 arch flagstone
-x 7
-y 2
+x 9
+y 4
 end
 arch longtable_2_1_2
-x 7
-y 2
+x 9
+y 4
 end
 arch flagstone
-x 7
-y 3
+x 9
+y 5
 end
 arch rune_drain_magic
-x 7
-y 3
+x 9
+y 5
 end
 arch flagstone
-x 7
-y 4
+x 9
+y 6
 end
 arch locked_door1
 name Council Chamber
@@ -679,16 +973,16 @@ slaying 1
 msg
 You need the silver key to open this door.
 endmsg
-x 7
-y 4
+x 9
+y 6
 end
 arch flagstone
-x 7
-y 5
+x 9
+y 7
 end
 arch stol_king_1
-x 7
-y 5
+x 9
+y 7
 end
 arch merchant
 name Lord Marksel
@@ -705,78 +999,100 @@ We are honored!  Page Jon shall assign a cot in the barracks.  We can talk more
 Greetings, stranger! You seem a man of honor.  Would you join my warband?
 endmsg
 hp 250
-x 7
-y 5
-end
-arch flagstone
-x 7
-y 6
-end
-arch table_3
-x 7
-y 6
-end
-arch flagstone
-x 7
+x 9
 y 7
 end
 arch flagstone
-x 7
+x 9
+y 8
+end
+arch table_3
+x 9
 y 8
 end
 arch flagstone
-x 7
+x 9
 y 9
 end
 arch flagstone
-x 7
+x 9
 y 10
 end
 arch flagstone
-x 7
+x 9
 y 11
 end
 arch flagstone
-x 7
+x 9
 y 12
 end
 arch flagstone
-x 7
+x 9
 y 13
 end
 arch flagstone
-x 7
+x 9
 y 14
 end
+arch flagstone
+x 9
+y 15
+end
+arch flagstone
+x 9
+y 16
+end
 arch oakdoor_2
 slaying /world/world_120_109
 hp 38
 sp 37
-x 7
-y 14
+x 9
+y 16
 end
-arch flagstone
-x 8
+arch dungeon_magic
+x 9
+y 17
 end
-arch flagstone_2_1_2
-x 8
+arch steppe
+x 9
+y 17
+move_block all
 end
-arch flagstone
-x 8
+arch steppe
+x 9
+y 18
+end
+arch steppe
+x 10
+end
+arch steppe
+x 10
 y 1
 end
 arch flagstone
-x 8
+x 10
 y 2
 end
-arch longtable_1_3
-x 8
+arch flagstone_2_1_2
+x 10
 y 2
 end
 arch flagstone
-x 8
+x 10
 y 3
 end
+arch flagstone
+x 10
+y 4
+end
+arch longtable_1_3
+x 10
+y 4
+end
+arch flagstone
+x 10
+y 5
+end
 arch mage
 name Advisor
 msg
@@ -784,8 +1100,8 @@ msg
 You should not be in here.
 endmsg
 hp 300
-x 8
-y 3
+x 10
+y 5
 type 0
 carrying 2500
 move_type walk
@@ -798,51 +1114,51 @@ end
 end
 end
 arch flagstone
-x 8
-y 4
+x 10
+y 6
 end
 arch flagstone_1_4
-x 8
-y 4
+x 10
+y 6
 end
 arch flagstone
-x 8
-y 5
+x 10
+y 7
 end
 arch key2
 name a silver key
 slaying 1
-x 8
-y 5
+x 10
+y 7
 end
 arch guard
-x 8
-y 5
-end
-arch flagstone
-x 8
-y 6
-end
-arch flagstone
-x 8
+x 10
 y 7
 end
 arch flagstone
-x 8
+x 10
 y 8
 end
 arch flagstone
-x 8
+x 10
 y 9
 end
 arch flagstone
-x 8
+x 10
 y 10
 end
 arch flagstone
-x 8
+x 10
 y 11
 end
+arch flagstone
+x 10
+y 12
+end
+arch flagstone
+x 10
+y 13
+end
 arch courier
 msg
 @match king | King | Navar
@@ -850,632 +1166,897 @@ His city lies to the south.  He is ruler of our province... or was.  There is no
 @match *
 I bear a message to my Lord.  The King of Navar is dead.
 endmsg
-x 8
-y 11
-end
-arch flagstone
-x 8
-y 12
-end
-arch flagstone
-x 8
+x 10
 y 13
 end
 arch flagstone
-x 8
+x 10
 y 14
 end
+arch flagstone
+x 10
+y 15
+end
+arch flagstone
+x 10
+y 16
+end
 arch flagstone_1_4
-x 8
-y 14
+x 10
+y 16
 end
-arch flagstone
-x 9
+arch dungeon_magic
+x 10
+y 17
 end
-arch flagstone_2_1_2
-x 9
+arch steppe
+x 10
+y 17
+move_block all
 end
-arch flagstone
-x 9
+arch steppe
+x 10
+y 18
+end
+arch steppe
+x 11
+end
+arch steppe
+x 11
 y 1
 end
 arch flagstone
-x 9
+x 11
 y 2
 end
+arch flagstone_2_1_2
+x 11
+y 2
+end
+arch flagstone
+x 11
+y 3
+end
+arch flagstone
+x 11
+y 4
+end
 arch random_weapon
-x 9
-y 2
-end
-arch flagstone
-x 9
-y 3
-end
-arch flagstone
-x 9
+x 11
 y 4
 end
+arch flagstone
+x 11
+y 5
+end
+arch flagstone
+x 11
+y 6
+end
 arch flagstone_2_1_2
-x 9
-y 4
+x 11
+y 6
 end
 arch flagstone
-x 9
-y 5
+x 11
+y 7
 end
 arch fireplace
-x 9
-y 5
-end
-arch flagstone
-x 9
-y 6
-end
-arch flagstone
-x 9
+x 11
 y 7
 end
 arch flagstone
-x 9
-y 8
-end
-arch cwall_0
-x 9
+x 11
 y 8
 end
 arch flagstone
-x 9
+x 11
 y 9
 end
 arch flagstone
-x 9
+x 11
+y 10
+end
+arch cwall_0
+x 11
 y 10
 end
 arch flagstone
-x 9
-y 11
-end
-arch cwall_0
-x 9
+x 11
 y 11
 end
 arch flagstone
-x 9
+x 11
 y 12
 end
 arch flagstone
-x 9
+x 11
+y 13
+end
+arch cwall_0
+x 11
 y 13
 end
 arch flagstone
-x 9
-y 14
-end
-arch flagstone_2_1_2
-x 9
+x 11
 y 14
 end
 arch flagstone
-x 10
+x 11
+y 15
+end
+arch flagstone
+x 11
+y 16
+end
+arch flagstone_2_1_2
+x 11
+y 16
+end
+arch steppe
+x 11
+y 17
+end
+arch steppe
+x 11
+y 18
+end
+arch steppe
+x 12
+end
+arch steppe
+x 12
+y 1
+end
+arch flagstone
+x 12
+y 2
 end
 arch flagstone_3_3
-x 10
-end
-arch flagstone
-x 10
-y 1
-end
-arch flagstone_2_1_1
-x 10
-y 1
-end
-arch flagstone
-x 10
-y 2
-end
-arch flagstone_2_1_1
-x 10
+x 12
 y 2
 end
 arch flagstone
-x 10
+x 12
 y 3
 end
 arch flagstone_2_1_1
-x 10
+x 12
 y 3
 end
 arch flagstone
-x 10
+x 12
 y 4
 end
+arch flagstone_2_1_1
+x 12
+y 4
+end
+arch flagstone
+x 12
+y 5
+end
+arch flagstone_2_1_1
+x 12
+y 5
+end
+arch flagstone
+x 12
+y 6
+end
 arch flagstone_3_4
-x 10
-y 4
+x 12
+y 6
 end
 arch flagstone
-x 10
-y 5
+x 12
+y 7
 end
 arch flagstone_2_1_1
-x 10
-y 5
-end
-arch flagstone
-x 10
-y 6
-end
-arch flagstone_2_2_1
-x 10
-y 6
-end
-arch flagstone
-x 10
+x 12
 y 7
 end
 arch flagstone
-x 10
+x 12
+y 8
+end
+arch flagstone_2_2_1
+x 12
 y 8
 end
 arch flagstone
-x 10
-y 9
-end
-arch chair_1.4
-x 10
+x 12
 y 9
 end
 arch flagstone
-x 10
+x 12
 y 10
 end
 arch flagstone
-x 10
+x 12
 y 11
 end
 arch chair_1.4
-x 10
+x 12
 y 11
 end
 arch flagstone
-x 10
+x 12
 y 12
 end
 arch flagstone
-x 10
+x 12
+y 13
+end
+arch chair_1.4
+x 12
 y 13
 end
 arch flagstone
-x 10
-y 14
-end
-arch flagstone_2_1_2
-x 10
+x 12
 y 14
 end
 arch flagstone
-x 11
-end
-arch flagstone_2_1_2
-x 11
+x 12
+y 15
 end
 arch flagstone
-x 11
+x 12
+y 16
+end
+arch flagstone_2_1_2
+x 12
+y 16
+end
+arch steppe
+x 12
+y 17
+end
+arch steppe
+x 12
+y 18
+end
+arch steppe
+x 13
+end
+arch steppe
+x 13
 y 1
 end
+arch flagstone
+x 13
+y 2
+end
+arch flagstone_2_1_2
+x 13
+y 2
+end
+arch flagstone
+x 13
+y 3
+end
 arch barrel
-x 11
-y 1
+x 13
+y 3
 end
 arch flagstone
-x 11
-y 2
+x 13
+y 4
 end
 arch stair_down_4
 slaying cellar
 hp 1
 sp 1
-x 11
-y 2
-end
-arch flagstone
-x 11
-y 3
-end
-arch barrel
-x 11
-y 3
-end
-arch flagstone
-x 11
+x 13
 y 4
 end
 arch flagstone
-x 11
+x 13
 y 5
 end
+arch barrel
+x 13
+y 5
+end
+arch flagstone
+x 13
+y 6
+end
+arch flagstone
+x 13
+y 7
+end
 arch stair_up
-x 11
-y 5
-end
-arch flagstone
-x 11
-y 6
-end
-arch flagstone_1_3
-x 11
-y 6
-end
-arch flagstone
-x 11
+x 13
 y 7
 end
 arch flagstone
-x 11
+x 13
 y 8
 end
-arch chair_1.1
-x 11
+arch flagstone_1_3
+x 13
 y 8
 end
 arch flagstone
-x 11
-y 9
-end
-arch table_4
-x 11
+x 13
 y 9
 end
 arch flagstone
-x 11
+x 13
 y 10
 end
 arch chair_1.1
-x 11
+x 13
 y 10
 end
 arch flagstone
-x 11
+x 13
 y 11
 end
 arch table_4
-x 11
+x 13
 y 11
 end
 arch flagstone
-x 11
+x 13
 y 12
 end
-arch chair_1.3
-x 11
+arch chair_1.1
+x 13
 y 12
 end
 arch flagstone
-x 11
+x 13
+y 13
+end
+arch table_4
+x 13
 y 13
 end
 arch flagstone
-x 11
+x 13
 y 14
 end
-arch flagstone_2_1_2
-x 11
+arch chair_1.3
+x 13
 y 14
 end
 arch flagstone
-x 12
+x 13
+y 15
+end
+arch flagstone
+x 13
+y 16
 end
 arch flagstone_2_1_2
-x 12
+x 13
+y 16
 end
-arch flagstone
-x 12
-y 1
+arch steppe
+x 13
+y 17
 end
-arch fireplace
-x 12
+arch steppe
+x 13
+y 18
+end
+arch steppe
+x 14
+end
+arch steppe
+x 14
 y 1
 end
 arch flagstone
-x 12
+x 14
+y 2
+end
+arch flagstone_2_1_2
+x 14
 y 2
 end
 arch flagstone
-x 12
+x 14
 y 3
 end
+arch fireplace
+x 14
+y 3
+end
+arch flagstone
+x 14
+y 4
+end
+arch flagstone
+x 14
+y 5
+end
 arch man
 name cook
-x 12
-y 3
-end
-arch flagstone
-x 12
-y 4
-end
-arch table_3
-x 12
-y 4
-end
-arch flagstone
-x 12
+x 14
 y 5
 end
 arch flagstone
-x 12
+x 14
 y 6
 end
-arch door_look_1
-x 12
+arch table_3
+x 14
 y 6
 end
 arch flagstone
-x 12
+x 14
 y 7
 end
 arch flagstone
-x 12
+x 14
 y 8
 end
+arch door_look_1
+x 14
+y 8
+end
+arch flagstone
+x 14
+y 9
+end
+arch flagstone
+x 14
+y 10
+end
 arch warrior_1
 msg
 @match *
 The bandits have been most troublesome.  I don't know how much more we can take, I wish the King of Navar would send an army to help us.
 endmsg
-x 12
-y 8
+x 14
+y 10
 end
 arch flagstone
-x 12
-y 9
+x 14
+y 11
 end
 arch chair_1.2
-x 12
-y 9
+x 14
+y 11
 end
 arch flagstone
-x 12
-y 10
+x 14
+y 12
 end
 arch dog
-x 12
-y 10
+x 14
+y 12
 unaggressive 1
 end
 arch flagstone
-x 12
-y 11
+x 14
+y 13
 end
 arch child
 name Jon
-x 12
-y 11
-end
-arch flagstone
-x 12
-y 12
-end
-arch flagstone
-x 12
+x 14
 y 13
 end
 arch flagstone
-x 12
-y 14
-end
-arch flagstone_2_1_2
-x 12
+x 14
 y 14
 end
 arch flagstone
-x 13
-end
-arch flagstone_2_1_2
-x 13
+x 14
+y 15
 end
 arch flagstone
-x 13
+x 14
+y 16
+end
+arch flagstone_2_1_2
+x 14
+y 16
+end
+arch steppe
+x 14
+y 17
+end
+arch steppe
+x 14
+y 18
+end
+arch steppe
+x 15
+end
+arch steppe
+x 15
 y 1
 end
 arch flagstone
-x 13
+x 15
 y 2
 end
-arch random_food
-x 13
+arch flagstone_2_1_2
+x 15
 y 2
 end
 arch flagstone
-x 13
-y 3
-end
-arch random_food
-x 13
+x 15
 y 3
 end
 arch flagstone
-x 13
+x 15
 y 4
 end
 arch random_food
-x 13
+x 15
 y 4
 end
 arch flagstone
-x 13
+x 15
 y 5
 end
 arch random_food
-x 13
+x 15
 y 5
 end
 arch flagstone
-x 13
+x 15
 y 6
 end
+arch random_food
+x 15
+y 6
+end
+arch flagstone
+x 15
+y 7
+end
+arch random_food
+x 15
+y 7
+end
+arch flagstone
+x 15
+y 8
+end
 arch flagstone_1_4
-x 13
-y 6
-end
-arch flagstone
-x 13
-y 7
-end
-arch flagstone
-x 13
-y 8
-end
-arch torch_1
-x 13
+x 15
 y 8
 end
 arch flagstone
-x 13
+x 15
 y 9
 end
 arch flagstone
-x 13
+x 15
+y 10
+end
+arch torch_1
+x 15
 y 10
 end
 arch flagstone
-x 13
+x 15
 y 11
 end
 arch flagstone
-x 13
-y 12
-end
-arch torch_1
-x 13
+x 15
 y 12
 end
 arch flagstone
-x 13
+x 15
 y 13
 end
 arch flagstone
-x 13
+x 15
 y 14
 end
+arch torch_1
+x 15
+y 14
+end
+arch flagstone
+x 15
+y 15
+end
+arch flagstone
+x 15
+y 16
+end
 arch flagstone_2_1_2
-x 13
-y 14
+x 15
+y 16
+end
+arch steppe
+x 15
+y 17
+end
+arch steppe
+x 15
+y 18
+end
+arch steppe
+x 16
+end
+arch steppe
+x 16
+y 1
 end
 arch flagstone
-x 14
+x 16
+y 2
 end
 arch flagstone_2_2_3
-x 14
-end
-arch flagstone
-x 14
-y 1
-end
-arch flagstone_2_1_1
-x 14
-y 1
-end
-arch flagstone
-x 14
-y 2
-end
-arch flagstone_2_1_1
-x 14
+x 16
 y 2
 end
 arch flagstone
-x 14
+x 16
 y 3
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 3
 end
 arch flagstone
-x 14
+x 16
 y 4
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 4
 end
 arch flagstone
-x 14
+x 16
 y 5
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 5
 end
 arch flagstone
-x 14
+x 16
 y 6
 end
+arch flagstone_2_1_1
+x 16
+y 6
+end
+arch flagstone
+x 16
+y 7
+end
+arch flagstone_2_1_1
+x 16
+y 7
+end
+arch flagstone
+x 16
+y 8
+end
 arch flagstone_3_4
-x 14
-y 6
-end
-arch flagstone
-x 14
-y 7
-end
-arch flagstone_2_1_1
-x 14
-y 7
-end
-arch flagstone
-x 14
-y 8
-end
-arch flagstone_2_1_1
-x 14
+x 16
 y 8
 end
 arch flagstone
-x 14
+x 16
 y 9
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 9
 end
 arch flagstone
-x 14
+x 16
 y 10
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 10
 end
 arch flagstone
-x 14
+x 16
 y 11
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 11
 end
 arch flagstone
-x 14
+x 16
 y 12
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 12
 end
 arch flagstone
-x 14
+x 16
 y 13
 end
 arch flagstone_2_1_1
-x 14
+x 16
 y 13
 end
 arch flagstone
-x 14
+x 16
 y 14
 end
+arch flagstone_2_1_1
+x 16
+y 14
+end
+arch flagstone
+x 16
+y 15
+end
+arch flagstone_2_1_1
+x 16
+y 15
+end
+arch flagstone
+x 16
+y 16
+end
 arch flagstone_2_2_4
-x 14
+x 16
+y 16
+end
+arch steppe
+x 16
+y 17
+end
+arch hills
+x 16
+y 18
+end
+arch steppe
+x 17
+end
+arch steppe
+x 17
+y 1
+end
+arch steppe
+x 17
+y 2
+end
+arch steppe
+x 17
+y 3
+end
+arch steppe
+x 17
+y 4
+end
+arch steppe
+x 17
+y 5
+end
+arch steppe
+x 17
+y 6
+end
+arch steppe
+x 17
+y 7
+end
+arch steppe
+x 17
+y 8
+end
+arch steppe
+x 17
+y 9
+end
+arch steppe
+x 17
+y 10
+end
+arch steppe
+x 17
+y 11
+end
+arch steppe
+x 17
+y 12
+end
+arch steppe
+x 17
+y 13
+end
+arch steppe
+x 17
 y 14
 end
+arch steppe
+x 17
+y 15
+end
+arch steppe
+x 17
+y 16
+end
+arch steppe
+x 17
+y 17
+end
+arch hills
+x 17
+y 18
+end
+arch steppe
+x 18
+end
+arch steppe
+x 18
+y 1
+end
+arch steppe
+x 18
+y 2
+end
+arch steppe
+x 18
+y 3
+end
+arch steppe
+x 18
+y 4
+end
+arch steppe
+x 18
+y 5
+end
+arch steppe
+x 18
+y 6
+end
+arch steppe
+x 18
+y 7
+end
+arch steppe
+x 18
+y 8
+end
+arch steppe
+x 18
+y 9
+end
+arch steppe
+x 18
+y 10
+end
+arch steppe
+x 18
+y 11
+end
+arch steppe
+x 18
+y 12
+end
+arch steppe
+x 18
+y 13
+end
+arch steppe
+x 18
+y 14
+end
+arch steppe
+x 18
+y 15
+end
+arch steppe
+x 18
+y 16
+end
+arch hills
+x 18
+y 17
+end
+arch hills
+x 18
+y 18
+end
diff --git a/world/world_120_109 b/world/world_120_109
index 5c7659f0c..ced30a7e1 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -4,7 +4,7 @@ region marksel
 width 50
 height 50
 msg
-Modified: 2012-06-15 Rick Tanner
+Modified: 2012-06-16 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_120_108
@@ -9983,8 +9983,8 @@ y 37
 end
 arch keep_sym
 slaying /marksel/keep
-hp 7
-sp 14
+hp 9
+sp 15
 x 38
 y 37
 end