diff --git a/dragonisland/tavern b/dragonisland/tavern
index 173f9b41b..8f97bd1c5 100644
--- a/dragonisland/tavern
+++ b/dragonisland/tavern
@@ -2,425 +2,656 @@ arch map
 name The Burning Adventurer
 difficulty 1
 region stoneville
-width 18
-height 16
-enter_x 8
-enter_y 15
+width 22
+height 20
+enter_x 10
+enter_y 17
 msg
 Created:  1997-07-18
-Modified: 2012-01-31 Rick Tanner
+Modified: 2012-06-06 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 grass_only
+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 grass_only
+x 1
+y 19
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
 arch afloor_right
 name floor
+x 2
+y 2
 end
 arch wall_2_2_2
-end
-arch afloor_right
-name floor
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch afloor_right
-name floor
-y 2
-end
-arch wall_2_1_1
+x 2
 y 2
 end
 arch afloor_right
 name floor
+x 2
 y 3
 end
 arch wall_2_1_1
+x 2
 y 3
 end
 arch afloor_right
 name floor
+x 2
 y 4
 end
 arch wall_2_1_1
+x 2
 y 4
 end
 arch afloor_right
 name floor
+x 2
 y 5
 end
 arch wall_2_1_1
+x 2
 y 5
 end
 arch afloor_right
 name floor
+x 2
 y 6
 end
 arch wall_2_1_1
+x 2
 y 6
 end
 arch afloor_right
 name floor
+x 2
 y 7
 end
 arch wall_2_1_1
+x 2
 y 7
 end
 arch afloor_right
 name floor
+x 2
 y 8
 end
 arch wall_2_1_1
+x 2
 y 8
 end
 arch afloor_right
 name floor
+x 2
 y 9
 end
 arch wall_2_1_1
+x 2
 y 9
 end
 arch afloor_right
 name floor
+x 2
 y 10
 end
 arch wall_2_1_1
+x 2
 y 10
 end
 arch afloor_right
 name floor
+x 2
 y 11
 end
 arch wall_2_1_1
+x 2
 y 11
 end
 arch afloor_right
 name floor
+x 2
 y 12
 end
 arch wall_2_1_1
+x 2
 y 12
 end
 arch afloor_right
 name floor
+x 2
 y 13
 end
 arch wall_2_1_1
+x 2
 y 13
 end
 arch afloor_right
 name floor
+x 2
 y 14
 end
 arch wall_2_1_1
+x 2
 y 14
 end
 arch afloor_right
 name floor
+x 2
 y 15
 end
+arch wall_2_1_1
+x 2
+y 15
+end
+arch afloor_right
+name floor
+x 2
+y 16
+end
+arch wall_2_1_1
+x 2
+y 16
+end
+arch afloor_right
+name floor
+x 2
+y 17
+end
 arch wall_2_2_1
-y 15
+x 2
+y 17
 end
-arch afloor_right
-name floor
-x 1
+arch grass_only
+x 2
+y 18
 end
-arch wall_2_1_2
-x 1
+arch grass_only
+x 2
+y 19
 end
-arch afloor_right
-name floor
-x 1
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
 y 1
 end
 arch afloor_right
 name floor
-x 1
+x 3
+y 2
+end
+arch wall_2_1_2
+x 3
 y 2
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 3
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 4
 end
 arch afloor_right
 name floor
-x 1
-y 5
-end
-arch chair_1.3
-x 1
+x 3
 y 5
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 6
 end
+arch afloor_right
+name floor
+x 3
+y 7
+end
+arch chair_1.3
+x 3
+y 7
+end
+arch afloor_right
+name floor
+x 3
+y 8
+end
 arch table_3
-x 1
-y 6
-end
-arch afloor_right
-name floor
-x 1
-y 7
-end
-arch afloor_right
-name floor
-x 1
+x 3
 y 8
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 9
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 10
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 11
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 12
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 13
 end
 arch afloor_right
 name floor
-x 1
+x 3
 y 14
 end
 arch afloor_right
 name floor
-x 1
-y 15
-end
-arch wall_2_1_2
-x 1
+x 3
 y 15
 end
 arch afloor_right
 name floor
-x 2
+x 3
+y 16
+end
+arch afloor_right
+name floor
+x 3
+y 17
 end
 arch wall_2_1_2
-x 2
+x 3
+y 17
+end
+arch grass_only
+x 3
+y 18
+end
+arch grass_only
+x 3
+y 19
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
 end
 arch afloor_right
 name floor
-x 2
-y 1
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
+y 2
+end
+arch afloor_right
+name floor
+x 4
+y 3
 end
 arch booze_table
 slaying money
 food 30
-x 2
-y 1
+x 4
+y 3
 invisible 1
 end
 arch table_2
-x 2
-y 1
+x 4
+y 3
 end
 arch afloor_right
 name floor
-x 2
-y 2
+x 4
+y 4
 end
 arch booze_table
 slaying money
 food 30
-x 2
-y 2
+x 4
+y 4
 invisible 1
 end
 arch table_2
-x 2
-y 2
-end
-arch afloor_right
-name floor
-x 2
-y 3
-end
-arch booze_table
-slaying money
-food 30
-x 2
-y 3
-invisible 1
-end
-arch chair_1.3
-x 2
-y 3
-end
-arch afloor_right
-name floor
-x 2
+x 4
 y 4
 end
 arch afloor_right
 name floor
-x 2
+x 4
+y 5
+end
+arch booze_table
+slaying money
+food 30
+x 4
+y 5
+invisible 1
+end
+arch chair_1.3
+x 4
 y 5
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 6
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 7
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 8
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 9
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 10
 end
+arch afloor_right
+name floor
+x 4
+y 11
+end
+arch afloor_right
+name floor
+x 4
+y 12
+end
 arch wall_1_4
-x 2
-y 10
-end
-arch afloor_right
-name floor
-x 2
-y 11
-end
-arch chair_1.3
-x 2
-y 11
-end
-arch afloor_right
-name floor
-x 2
-y 12
-end
-arch chair_1.3
-x 2
+x 4
 y 12
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 13
 end
 arch chair_1.3
-x 2
+x 4
 y 13
 end
 arch afloor_right
 name floor
-x 2
+x 4
+y 14
+end
+arch chair_1.3
+x 4
 y 14
 end
 arch afloor_right
 name floor
-x 2
+x 4
 y 15
 end
-arch wall_2_1_2
-x 2
+arch chair_1.3
+x 4
 y 15
 end
 arch afloor_right
 name floor
-x 3
+x 4
+y 16
+end
+arch afloor_right
+name floor
+x 4
+y 17
 end
 arch wall_2_1_2
-x 3
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch grass_only
+x 4
+y 19
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch afloor_right
+name floor
+x 5
+y 2
+end
+arch wall_2_1_2
+x 5
+y 2
 end
 arch swall_1_1_half
-x 3
-end
-arch afloor_right
-name floor
-x 3
-y 1
-end
-arch swall_2_1_1
-x 3
-y 1
-end
-arch afloor_right
-name floor
-x 3
-y 2
-end
-arch swall_2_1_1
-x 3
+x 5
 y 2
 end
 arch afloor_right
 name floor
-x 3
+x 5
 y 3
 end
+arch swall_2_1_1
+x 5
+y 3
+end
+arch afloor_right
+name floor
+x 5
+y 4
+end
+arch swall_2_1_1
+x 5
+y 4
+end
+arch afloor_right
+name floor
+x 5
+y 5
+end
 arch swall_2_2_1
-x 3
-y 3
-end
-arch afloor_right
-name floor
-x 3
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 3
-y 4
-invisible 1
-end
-arch table_2
-x 3
-y 4
-end
-arch afloor_right
-name floor
-x 3
+x 5
 y 5
 end
 arch afloor_right
 name floor
-x 3
+x 5
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 5
+y 6
+invisible 1
+end
+arch table_2
+x 5
 y 6
 end
 arch afloor_right
 name floor
-x 3
+x 5
 y 7
 end
+arch afloor_right
+name floor
+x 5
+y 8
+end
+arch afloor_right
+name floor
+x 5
+y 9
+end
 arch chair_1.3
-x 3
-y 7
+x 5
+y 9
 end
 arch fatman
 name Tobias
@@ -436,133 +667,150 @@ Well, that this is probably the right place for you to live.  The guild is famou
 @match test|guild
 Well, the adventurers guild ties the guild key to the eye of a dread.  Nice test, that is.
 endmsg
-x 3
-y 7
+x 5
+y 9
 stand_still 1
 end
 arch afloor_right
 name floor
-x 3
-y 8
-end
-arch afloor_right
-name floor
-x 3
-y 9
-end
-arch afloor_right
-name floor
-x 3
+x 5
 y 10
 end
+arch afloor_right
+name floor
+x 5
+y 11
+end
+arch afloor_right
+name floor
+x 5
+y 12
+end
 arch wall_2_1_2
-x 3
-y 10
-end
-arch afloor_right
-name floor
-x 3
-y 11
-end
-arch table_4
-x 3
-y 11
-end
-arch afloor_right
-name floor
-x 3
-y 12
-end
-arch table_4
-x 3
+x 5
 y 12
 end
 arch afloor_right
 name floor
-x 3
+x 5
 y 13
 end
 arch table_4
-x 3
+x 5
 y 13
 end
 arch afloor_right
 name floor
-x 3
+x 5
+y 14
+end
+arch table_4
+x 5
 y 14
 end
 arch afloor_right
 name floor
-x 3
+x 5
 y 15
 end
-arch wall_2_1_2
-x 3
+arch table_4
+x 5
 y 15
 end
 arch afloor_right
 name floor
-x 4
+x 5
+y 16
+end
+arch afloor_right
+name floor
+x 5
+y 17
 end
 arch wall_2_1_2
-x 4
+x 5
+y 17
 end
-arch afloor_right
-name floor
-x 4
-y 1
+arch grass_only
+x 5
+y 18
 end
-arch longtable_1_4
-x 4
-y 1
+arch grass_only
+x 5
+y 19
 end
-arch booze
-x 4
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
 y 1
 end
 arch afloor_right
 name floor
-x 4
+x 6
+y 2
+end
+arch wall_2_1_2
+x 6
 y 2
 end
 arch afloor_right
 name floor
-x 4
+x 6
 y 3
 end
+arch longtable_1_4
+x 6
+y 3
+end
+arch booze
+x 6
+y 3
+end
+arch afloor_right
+name floor
+x 6
+y 4
+end
+arch afloor_right
+name floor
+x 6
+y 5
+end
 arch swall_2_1_2
-x 4
-y 3
-end
-arch afloor_right
-name floor
-x 4
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 4
-y 4
-invisible 1
-end
-arch table_2
-x 4
-y 4
-end
-arch afloor_right
-name floor
-x 4
+x 6
 y 5
 end
 arch afloor_right
 name floor
-x 4
+x 6
 y 6
 end
-arch chair_1.3
-x 4
+arch booze_table
+slaying money
+food 30
+x 6
 y 6
+invisible 1
+end
+arch table_2
+x 6
+y 6
+end
+arch afloor_right
+name floor
+x 6
+y 7
+end
+arch afloor_right
+name floor
+x 6
+y 8
+end
+arch chair_1.3
+x 6
+y 8
 end
 arch fatwoman
 name Janny
@@ -570,43 +818,43 @@ msg
 @match *
 Hmpf, leave me alone.  I've got to forget this day.
 endmsg
-x 4
-y 6
+x 6
+y 8
 stand_still 1
 end
 arch afloor_right
 name floor
-x 4
-y 7
+x 6
+y 9
 end
 arch table_3
-x 4
-y 7
-end
-arch afloor_right
-name floor
-x 4
-y 8
-end
-arch afloor_right
-name floor
-x 4
+x 6
 y 9
 end
 arch afloor_right
 name floor
-x 4
-y 10
-end
-arch wall_2_1_2
-x 4
+x 6
 y 10
 end
 arch afloor_right
 name floor
-x 4
+x 6
 y 11
 end
+arch afloor_right
+name floor
+x 6
+y 12
+end
+arch wall_2_1_2
+x 6
+y 12
+end
+arch afloor_right
+name floor
+x 6
+y 13
+end
 arch veiled_woman
 name Jalishea
 msg
@@ -620,13 +868,13 @@ instead of getting yourself killed!
 @match *
 Nice day, isn't it?
 endmsg
-x 4
-y 11
+x 6
+y 13
 end
 arch afloor_right
 name floor
-x 4
-y 12
+x 6
+y 14
 end
 arch warrior_1
 name bodyguard
@@ -634,421 +882,490 @@ msg
 @match *
 Please leave the lady alone!
 endmsg
-x 4
-y 12
-end
-arch afloor_right
-name floor
-x 4
-y 13
-end
-arch afloor_right
-name floor
-x 4
+x 6
 y 14
 end
 arch afloor_right
 name floor
-x 4
-y 15
-end
-arch wall_2_1_2
-x 4
+x 6
 y 15
 end
 arch afloor_right
 name floor
-x 5
+x 6
+y 16
+end
+arch afloor_right
+name floor
+x 6
+y 17
 end
 arch wall_2_1_2
-x 5
+x 6
+y 17
 end
-arch afloor_right
-name floor
-x 5
-y 1
+arch grass_only
+x 6
+y 18
 end
-arch longtable_2_1_2
-x 5
-y 1
+arch grass_only
+x 6
+y 19
 end
-arch booze
-x 5
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
 arch afloor_right
 name floor
-x 5
+x 7
+y 2
+end
+arch wall_2_1_2
+x 7
 y 2
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 3
 end
-arch swall_2_1_2
-x 5
+arch longtable_2_1_2
+x 7
+y 3
+end
+arch booze
+x 7
 y 3
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 4
 end
+arch afloor_right
+name floor
+x 7
+y 5
+end
+arch swall_2_1_2
+x 7
+y 5
+end
+arch afloor_right
+name floor
+x 7
+y 6
+end
 arch booze_table
 slaying money
 food 30
-x 5
-y 4
+x 7
+y 6
 invisible 1
 end
 arch chair_1.3
-x 5
-y 4
+x 7
+y 6
 end
 arch afloor_right
 name floor
-x 5
-y 5
+x 7
+y 7
 end
 arch child
 msg
 @match *
 My mummy says a shall not speak to strangers, so I will not! Go away!
 endmsg
-x 5
-y 5
-end
-arch afloor_right
-name floor
-x 5
-y 6
-end
-arch afloor_right
-name floor
-x 5
+x 7
 y 7
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 8
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 9
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 10
 end
+arch afloor_right
+name floor
+x 7
+y 11
+end
+arch afloor_right
+name floor
+x 7
+y 12
+end
 arch wall_2_2_3
-x 5
-y 10
-end
-arch afloor_right
-name floor
-x 5
-y 11
-end
-arch wall_2_1_1
-x 5
-y 11
-end
-arch afloor_right
-name floor
-x 5
-y 12
-end
-arch wall_2_1_1
-x 5
+x 7
 y 12
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 13
 end
 arch wall_2_1_1
-x 5
+x 7
 y 13
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 14
 end
 arch wall_2_1_1
-x 5
+x 7
 y 14
 end
 arch afloor_right
 name floor
-x 5
+x 7
 y 15
 end
+arch wall_2_1_1
+x 7
+y 15
+end
+arch afloor_right
+name floor
+x 7
+y 16
+end
+arch wall_2_1_1
+x 7
+y 16
+end
+arch afloor_right
+name floor
+x 7
+y 17
+end
 arch wall_3_1
-x 5
-y 15
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
 end
 arch afloor_right
 name floor
-x 6
+x 8
+y 2
 end
 arch wall_2_1_2
-x 6
+x 8
+y 2
 end
 arch afloor_right
 name floor
-x 6
-y 1
+x 8
+y 3
 end
 arch longtable_1_3
-x 6
-y 1
+x 8
+y 3
 end
 arch booze
-x 6
-y 1
-end
-arch afloor_right
-name floor
-x 6
-y 2
-end
-arch afloor_right
-name floor
-x 6
+x 8
 y 3
 end
+arch afloor_right
+name floor
+x 8
+y 4
+end
+arch afloor_right
+name floor
+x 8
+y 5
+end
 arch swall_2_1_2
-x 6
-y 3
-end
-arch afloor_right
-name floor
-x 6
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 6
-y 4
-invisible 1
-end
-arch table_2
-x 6
-y 4
-end
-arch afloor_right
-name floor
-x 6
+x 8
 y 5
 end
 arch afloor_right
 name floor
-x 6
+x 8
 y 6
 end
-arch chair_1.3
-x 6
-y 6
-end
-arch afloor_right
-name floor
-x 6
-y 7
-end
-arch afloor_right
-name floor
-x 6
-y 8
-end
-arch afloor_right
-name floor
-x 6
-y 9
-end
-arch afloor_right
-name floor
-x 6
-y 10
-end
-arch afloor_right
-name floor
-x 6
-y 11
-end
-arch afloor_right
-name floor
-x 6
-y 12
-end
-arch chair_1.3
-x 6
-y 12
-end
-arch afloor_right
-name floor
-x 6
-y 13
-end
-arch afloor_right
-name floor
-x 6
-y 14
-end
-arch afloor_right
-name floor
-x 6
-y 15
-end
-arch wall_2_1_2
-x 6
-y 15
-end
-arch afloor_right
-name floor
-x 7
-end
-arch wall_2_1_2
-x 7
-end
-arch afloor_right
-name floor
-x 7
-y 1
-end
-arch afloor_right
-name floor
-x 7
-y 2
-end
-arch afloor_right
-name floor
-x 7
-y 3
-end
-arch swall_2_1_2
-x 7
-y 3
-end
-arch afloor_right
-name floor
-x 7
-y 4
-end
 arch booze_table
 slaying money
 food 30
-x 7
-y 4
+x 8
+y 6
 invisible 1
 end
 arch table_2
-x 7
-y 4
-end
-arch afloor_right
-name floor
-x 7
-y 5
-end
-arch afloor_right
-name floor
-x 7
-y 6
-end
-arch table_3
-x 7
+x 8
 y 6
 end
 arch afloor_right
 name floor
-x 7
+x 8
 y 7
 end
 arch afloor_right
 name floor
-x 7
+x 8
+y 8
+end
+arch chair_1.3
+x 8
 y 8
 end
 arch afloor_right
 name floor
-x 7
-y 9
-end
-arch chair_1.3
-x 7
+x 8
 y 9
 end
 arch afloor_right
 name floor
-x 7
+x 8
 y 10
 end
 arch afloor_right
 name floor
-x 7
+x 8
 y 11
 end
 arch afloor_right
 name floor
-x 7
-y 12
-end
-arch table_3
-x 7
+x 8
 y 12
 end
 arch afloor_right
 name floor
-x 7
+x 8
 y 13
 end
+arch afloor_right
+name floor
+x 8
+y 14
+end
 arch chair_1.3
-x 7
+x 8
+y 14
+end
+arch afloor_right
+name floor
+x 8
+y 15
+end
+arch afloor_right
+name floor
+x 8
+y 16
+end
+arch afloor_right
+name floor
+x 8
+y 17
+end
+arch wall_2_1_2
+x 8
+y 17
+end
+arch grass_only
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch afloor_right
+name floor
+x 9
+y 2
+end
+arch wall_2_1_2
+x 9
+y 2
+end
+arch afloor_right
+name floor
+x 9
+y 3
+end
+arch afloor_right
+name floor
+x 9
+y 4
+end
+arch afloor_right
+name floor
+x 9
+y 5
+end
+arch swall_2_1_2
+x 9
+y 5
+end
+arch afloor_right
+name floor
+x 9
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 9
+y 6
+invisible 1
+end
+arch table_2
+x 9
+y 6
+end
+arch afloor_right
+name floor
+x 9
+y 7
+end
+arch afloor_right
+name floor
+x 9
+y 8
+end
+arch table_3
+x 9
+y 8
+end
+arch afloor_right
+name floor
+x 9
+y 9
+end
+arch afloor_right
+name floor
+x 9
+y 10
+end
+arch afloor_right
+name floor
+x 9
+y 11
+end
+arch chair_1.3
+x 9
+y 11
+end
+arch afloor_right
+name floor
+x 9
+y 12
+end
+arch afloor_right
+name floor
+x 9
 y 13
 end
 arch afloor_right
 name floor
-x 7
+x 9
 y 14
 end
+arch table_3
+x 9
+y 14
+end
+arch afloor_right
+name floor
+x 9
+y 15
+end
+arch chair_1.3
+x 9
+y 15
+end
+arch afloor_right
+name floor
+x 9
+y 16
+end
 arch a_guard_l
 name tavern guard
-x 7
-y 14
+x 9
+y 16
 end
 arch afloor_right
 name floor
-x 7
-y 15
+x 9
+y 17
 end
 arch wall_1_3
-x 7
-y 15
+x 9
+y 17
 end
-arch afloor_right
-name floor
-x 8
+arch grass_only
+x 9
+y 18
+move_block all
 end
-arch wall_2_1_2
-x 8
+arch grass_only
+x 9
+y 19
 end
-arch afloor_right
-name floor
-x 8
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 2
 end
+arch wall_2_1_2
+x 10
+y 2
+end
+arch afloor_right
+name floor
+x 10
+y 3
+end
+arch afloor_right
+name floor
+x 10
+y 4
+end
 arch c_man
 name barkeep
 msg
@@ -1057,859 +1374,982 @@ A drink costs 3 gp.
 @match *
 Do you want something to drink?
 endmsg
-x 8
-y 2
+x 10
+y 4
 end
 arch afloor_right
 name floor
-x 8
-y 3
+x 10
+y 5
 end
 arch swall_2_1_2
-x 8
-y 3
+x 10
+y 5
 end
 arch afloor_right
 name floor
-x 8
-y 4
+x 10
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 8
-y 4
+x 10
+y 6
 invisible 1
 end
 arch table_2
-x 8
-y 4
-end
-arch afloor_right
-name floor
-x 8
-y 5
-end
-arch afloor_right
-name floor
-x 8
+x 10
 y 6
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 7
 end
 arch afloor_right
 name floor
-x 8
-y 8
-end
-arch chair_1.3
-x 8
+x 10
 y 8
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 9
 end
+arch afloor_right
+name floor
+x 10
+y 10
+end
+arch chair_1.3
+x 10
+y 10
+end
+arch afloor_right
+name floor
+x 10
+y 11
+end
 arch table_3
-x 8
-y 9
-end
-arch afloor_right
-name floor
-x 8
-y 10
-end
-arch chair_1.3
-x 8
-y 10
-end
-arch afloor_right
-name floor
-x 8
+x 10
 y 11
 end
 arch afloor_right
 name floor
-x 8
+x 10
+y 12
+end
+arch chair_1.3
+x 10
 y 12
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 13
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 14
 end
 arch afloor_right
 name floor
-x 8
+x 10
 y 15
 end
+arch afloor_right
+name floor
+x 10
+y 16
+end
+arch afloor_right
+name floor
+x 10
+y 17
+end
 arch oakdoor_2
 slaying /world/world_103_127
 hp 2
 sp 15
-x 8
-y 15
+x 10
+y 17
 end
-arch afloor_right
-name floor
-x 9
+arch grass_only
+x 10
+y 18
+move_block all
 end
-arch wall_2_1_2
-x 9
+arch grass_only
+x 10
+y 19
 end
-arch afloor_right
-name floor
-x 9
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch afloor_right
 name floor
-x 9
+x 11
+y 2
+end
+arch wall_2_1_2
+x 11
 y 2
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 3
 end
+arch afloor_right
+name floor
+x 11
+y 4
+end
+arch afloor_right
+name floor
+x 11
+y 5
+end
 arch swall_2_1_2
-x 9
-y 3
-end
-arch afloor_right
-name floor
-x 9
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 9
-y 4
-invisible 1
-end
-arch chair_1.3
-x 9
-y 4
-end
-arch afloor_right
-name floor
-x 9
+x 11
 y 5
 end
 arch afloor_right
 name floor
-x 9
+x 11
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 11
+y 6
+invisible 1
+end
+arch chair_1.3
+x 11
 y 6
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 7
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 8
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 9
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 10
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 11
 end
 arch afloor_right
 name floor
-x 9
-y 12
-end
-arch chair_1.3
-x 9
+x 11
 y 12
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 13
 end
 arch afloor_right
 name floor
-x 9
+x 11
+y 14
+end
+arch chair_1.3
+x 11
 y 14
 end
 arch afloor_right
 name floor
-x 9
+x 11
 y 15
 end
+arch afloor_right
+name floor
+x 11
+y 16
+end
+arch afloor_right
+name floor
+x 11
+y 17
+end
 arch oakdoor_2
 slaying /world/world_103_127
 hp 2
 sp 15
-x 9
-y 15
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+move_block all
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
 end
 arch afloor_right
 name floor
-x 10
+x 12
+y 2
 end
 arch wall_2_1_2
-x 10
+x 12
+y 2
 end
 arch afloor_right
 name floor
-x 10
-y 1
+x 12
+y 3
 end
 arch longtable_1_4
-x 10
-y 1
+x 12
+y 3
 end
 arch booze
-x 10
-y 1
-end
-arch afloor_right
-name floor
-x 10
-y 2
-end
-arch afloor_right
-name floor
-x 10
+x 12
 y 3
 end
+arch afloor_right
+name floor
+x 12
+y 4
+end
+arch afloor_right
+name floor
+x 12
+y 5
+end
 arch swall_2_1_2
-x 10
-y 3
-end
-arch afloor_right
-name floor
-x 10
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 10
-y 4
-invisible 1
-end
-arch chair_1.3
-x 10
-y 4
-end
-arch afloor_right
-name floor
-x 10
+x 12
 y 5
 end
 arch afloor_right
 name floor
-x 10
+x 12
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 12
+y 6
+invisible 1
+end
+arch chair_1.3
+x 12
 y 6
 end
 arch afloor_right
 name floor
-x 10
-y 7
-end
-arch chair_1.3
-x 10
+x 12
 y 7
 end
 arch afloor_right
 name floor
-x 10
+x 12
 y 8
 end
 arch afloor_right
 name floor
-x 10
+x 12
+y 9
+end
+arch chair_1.3
+x 12
 y 9
 end
 arch afloor_right
 name floor
-x 10
+x 12
 y 10
 end
 arch afloor_right
 name floor
-x 10
+x 12
 y 11
 end
 arch afloor_right
 name floor
-x 10
-y 12
-end
-arch table_3
-x 10
+x 12
 y 12
 end
 arch afloor_right
 name floor
-x 10
+x 12
 y 13
 end
 arch afloor_right
 name floor
-x 10
+x 12
 y 14
 end
+arch table_3
+x 12
+y 14
+end
+arch afloor_right
+name floor
+x 12
+y 15
+end
+arch afloor_right
+name floor
+x 12
+y 16
+end
 arch a_guard_l
 name tavern guard
-x 10
-y 14
+x 12
+y 16
 end
 arch afloor_right
 name floor
-x 10
-y 15
+x 12
+y 17
 end
 arch wall_1_4
-x 10
-y 15
+x 12
+y 17
+end
+arch grass_only
+x 12
+y 18
+move_block all
+end
+arch grass_only
+x 12
+y 19
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
 end
 arch afloor_right
 name floor
-x 11
+x 13
+y 2
 end
 arch wall_2_1_2
-x 11
-end
-arch afloor_right
-name floor
-x 11
-y 1
-end
-arch longtable_2_1_2
-x 11
-y 1
-end
-arch booze
-x 11
-y 1
-end
-arch afloor_right
-name floor
-x 11
+x 13
 y 2
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 3
 end
+arch longtable_2_1_2
+x 13
+y 3
+end
+arch booze
+x 13
+y 3
+end
+arch afloor_right
+name floor
+x 13
+y 4
+end
+arch afloor_right
+name floor
+x 13
+y 5
+end
 arch swall_2_1_2
-x 11
-y 3
-end
-arch afloor_right
-name floor
-x 11
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 11
-y 4
-invisible 1
-end
-arch table_2
-x 11
-y 4
-end
-arch afloor_right
-name floor
-x 11
+x 13
 y 5
 end
 arch afloor_right
 name floor
-x 11
+x 13
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 13
+y 6
+invisible 1
+end
+arch table_2
+x 13
 y 6
 end
 arch afloor_right
 name floor
-x 11
-y 7
-end
-arch table_3
-x 11
+x 13
 y 7
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 8
 end
 arch afloor_right
 name floor
-x 11
+x 13
+y 9
+end
+arch table_3
+x 13
 y 9
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 10
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 11
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 12
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 13
 end
 arch afloor_right
 name floor
-x 11
+x 13
 y 14
 end
 arch afloor_right
 name floor
-x 11
-y 15
-end
-arch wall_2_1_2
-x 11
+x 13
 y 15
 end
 arch afloor_right
 name floor
-x 12
+x 13
+y 16
+end
+arch afloor_right
+name floor
+x 13
+y 17
 end
 arch wall_2_1_2
-x 12
+x 13
+y 17
 end
-arch afloor_right
-name floor
-x 12
-y 1
+arch grass_only
+x 13
+y 18
 end
-arch longtable_1_3
-x 12
-y 1
+arch grass_only
+x 13
+y 19
 end
-arch booze
-x 12
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
 arch afloor_right
 name floor
-x 12
+x 14
+y 2
+end
+arch wall_2_1_2
+x 14
 y 2
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 3
 end
+arch longtable_1_3
+x 14
+y 3
+end
+arch booze
+x 14
+y 3
+end
+arch afloor_right
+name floor
+x 14
+y 4
+end
+arch afloor_right
+name floor
+x 14
+y 5
+end
 arch swall_2_1_2
-x 12
-y 3
-end
-arch afloor_right
-name floor
-x 12
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 12
-y 4
-invisible 1
-end
-arch table_2
-x 12
-y 4
-end
-arch afloor_right
-name floor
-x 12
+x 14
 y 5
 end
 arch afloor_right
 name floor
-x 12
+x 14
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 14
+y 6
+invisible 1
+end
+arch table_2
+x 14
 y 6
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 7
 end
+arch afloor_right
+name floor
+x 14
+y 8
+end
+arch afloor_right
+name floor
+x 14
+y 9
+end
 arch dancing_girl
 msg
 @match *
 Isn't the world wonderful? Yes, of course it is! All dancing and happiness!
 endmsg
-x 12
-y 7
-end
-arch afloor_right
-name floor
-x 12
-y 8
-end
-arch afloor_right
-name floor
-x 12
+x 14
 y 9
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 10
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 11
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 12
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 13
 end
 arch afloor_right
 name floor
-x 12
+x 14
 y 14
 end
 arch afloor_right
 name floor
-x 12
-y 15
-end
-arch wall_2_1_2
-x 12
+x 14
 y 15
 end
 arch afloor_right
 name floor
-x 13
+x 14
+y 16
+end
+arch afloor_right
+name floor
+x 14
+y 17
 end
 arch wall_2_1_2
-x 13
+x 14
+y 17
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch afloor_right
+name floor
+x 15
+y 2
+end
+arch wall_2_1_2
+x 15
+y 2
 end
 arch swall_1_1_half
-x 13
-end
-arch afloor_right
-name floor
-x 13
-y 1
-end
-arch swall_2_1_1
-x 13
-y 1
-end
-arch afloor_right
-name floor
-x 13
-y 2
-end
-arch swall_2_1_1
-x 13
+x 15
 y 2
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 3
 end
+arch swall_2_1_1
+x 15
+y 3
+end
+arch afloor_right
+name floor
+x 15
+y 4
+end
+arch swall_2_1_1
+x 15
+y 4
+end
+arch afloor_right
+name floor
+x 15
+y 5
+end
 arch swall_2_2_4
-x 13
-y 3
-end
-arch afloor_right
-name floor
-x 13
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 13
-y 4
-invisible 1
-end
-arch table_2
-x 13
-y 4
-end
-arch afloor_right
-name floor
-x 13
+x 15
 y 5
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 6
 end
-arch chair_1.3
-x 13
+arch booze_table
+slaying money
+food 30
+x 15
+y 6
+invisible 1
+end
+arch table_2
+x 15
 y 6
 end
 arch afloor_right
 name floor
-x 13
-y 7
-end
-arch chair_1.3
-x 13
+x 15
 y 7
 end
 arch afloor_right
 name floor
-x 13
+x 15
+y 8
+end
+arch chair_1.3
+x 15
 y 8
 end
 arch afloor_right
 name floor
-x 13
+x 15
+y 9
+end
+arch chair_1.3
+x 15
 y 9
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 10
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 11
 end
+arch afloor_right
+name floor
+x 15
+y 12
+end
+arch afloor_right
+name floor
+x 15
+y 13
+end
 arch wall_2_2_2
-x 13
-y 11
-end
-arch afloor_right
-name floor
-x 13
-y 12
-end
-arch wall_2_1_1
-x 13
-y 12
-end
-arch afloor_right
-name floor
-x 13
-y 13
-end
-arch wall_2_1_1
-x 13
+x 15
 y 13
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 14
 end
 arch wall_2_1_1
-x 13
+x 15
 y 14
 end
 arch afloor_right
 name floor
-x 13
+x 15
 y 15
 end
+arch wall_2_1_1
+x 15
+y 15
+end
+arch afloor_right
+name floor
+x 15
+y 16
+end
+arch wall_2_1_1
+x 15
+y 16
+end
+arch afloor_right
+name floor
+x 15
+y 17
+end
 arch wall_3_1
-x 13
-y 15
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
 end
 arch afloor_right
 name floor
-x 14
+x 16
+y 2
 end
 arch wall_2_1_2
-x 14
+x 16
+y 2
 end
 arch afloor_right
 name floor
-x 14
-y 1
+x 16
+y 3
 end
 arch booze_table
 slaying money
 food 30
-x 14
-y 1
+x 16
+y 3
 invisible 1
 end
 arch table_2
-x 14
-y 1
+x 16
+y 3
 end
 arch afloor_right
 name floor
-x 14
-y 2
+x 16
+y 4
 end
 arch booze_table
 slaying money
 food 30
-x 14
-y 2
+x 16
+y 4
 invisible 1
 end
 arch table_2
-x 14
-y 2
-end
-arch afloor_right
-name floor
-x 14
-y 3
-end
-arch booze_table
-slaying money
-food 30
-x 14
-y 3
-invisible 1
-end
-arch chair_1.3
-x 14
-y 3
-end
-arch afloor_right
-name floor
-x 14
+x 16
 y 4
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 5
 end
+arch booze_table
+slaying money
+food 30
+x 16
+y 5
+invisible 1
+end
 arch chair_1.3
-x 14
+x 16
 y 5
 end
 arch afloor_right
 name floor
-x 14
-y 6
-end
-arch table_3
-x 14
+x 16
 y 6
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 7
 end
-arch table_3
-x 14
+arch chair_1.3
+x 16
 y 7
 end
 arch afloor_right
 name floor
-x 14
+x 16
+y 8
+end
+arch table_3
+x 16
 y 8
 end
 arch afloor_right
 name floor
-x 14
+x 16
+y 9
+end
+arch table_3
+x 16
 y 9
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 10
 end
 arch afloor_right
 name floor
-x 14
-y 11
-end
-arch wall_2_1_2
-x 14
+x 16
 y 11
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 12
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 13
 end
-arch chair_1.3
-x 14
+arch wall_2_1_2
+x 16
 y 13
 end
 arch afloor_right
 name floor
-x 14
+x 16
 y 14
 end
+arch afloor_right
+name floor
+x 16
+y 15
+end
 arch chair_1.3
-x 14
-y 14
-end
-arch afloor_right
-name floor
-x 14
-y 15
-end
-arch wall_2_1_2
-x 14
+x 16
 y 15
 end
 arch afloor_right
 name floor
-x 15
+x 16
+y 16
 end
-arch wall_2_1_2
-x 15
+arch chair_1.3
+x 16
+y 16
 end
 arch afloor_right
 name floor
-x 15
+x 16
+y 17
+end
+arch wall_2_1_2
+x 16
+y 17
+end
+arch grass_only
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
 y 1
 end
+arch afloor_right
+name floor
+x 17
+y 2
+end
+arch wall_2_1_2
+x 17
+y 2
+end
+arch afloor_right
+name floor
+x 17
+y 3
+end
 arch dark_elf
 name Kharazzad Do'Bredin
 msg
@@ -1918,41 +2358,41 @@ Hello! You seem to be a nice person.  Maybe you would like to visit my friends i
 @match traitor|treason|liar
 Sh! What a harsh word to use!
 endmsg
-x 15
-y 1
+x 17
+y 3
 friendly 1
 unaggressive 1
 end
 arch afloor_right
 name floor
-x 15
-y 2
-end
-arch afloor_right
-name floor
-x 15
-y 3
-end
-arch afloor_right
-name floor
-x 15
+x 17
 y 4
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 5
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 6
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 7
 end
+arch afloor_right
+name floor
+x 17
+y 8
+end
+arch afloor_right
+name floor
+x 17
+y 9
+end
 arch sailor
 msg
 @match h[ae]llo|hi
@@ -1962,137 +2402,154 @@ The people who live here are adventurers, and they got all their pet monsters wi
 @match cellar|undead
 Yes, just have a look at Damaris' house, that cellar is crawling with skeletons and the gods know what else.
 endmsg
-x 15
-y 7
-end
-arch afloor_right
-name floor
-x 15
-y 8
-end
-arch afloor_right
-name floor
-x 15
+x 17
 y 9
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 10
 end
 arch afloor_right
 name floor
-x 15
-y 11
-end
-arch wall_1_3
-x 15
+x 17
 y 11
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 12
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 13
 end
-arch table_4
-x 15
+arch wall_1_3
+x 17
 y 13
 end
 arch afloor_right
 name floor
-x 15
+x 17
 y 14
 end
+arch afloor_right
+name floor
+x 17
+y 15
+end
 arch table_4
-x 15
-y 14
-end
-arch afloor_right
-name floor
-x 15
-y 15
-end
-arch wall_2_1_2
-x 15
+x 17
 y 15
 end
 arch afloor_right
 name floor
-x 16
+x 17
+y 16
 end
-arch wall_2_1_2
-x 16
+arch table_4
+x 17
+y 16
 end
 arch afloor_right
 name floor
-x 16
+x 17
+y 17
+end
+arch wall_2_1_2
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch cobblestones2
+x 18
+end
+arch grass_only
+x 18
 y 1
 end
 arch afloor_right
 name floor
-x 16
+x 18
+y 2
+end
+arch wall_2_1_2
+x 18
 y 2
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 3
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 4
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 5
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 6
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 7
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 8
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 9
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 10
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 11
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 12
 end
 arch afloor_right
 name floor
-x 16
+x 18
 y 13
 end
+arch afloor_right
+name floor
+x 18
+y 14
+end
+arch afloor_right
+name floor
+x 18
+y 15
+end
 arch elec_dragon
 name electric dragon child
 msg
@@ -2101,15 +2558,15 @@ Hello! This is a nice tavern the humans have build here! I wish my parents could
 @match parent|parents
 Unfortunately my parents are too large to fit into this tavern!
 endmsg
-x 16
-y 13
+x 18
+y 15
 friendly 1
 unaggressive 1
 end
 arch afloor_right
 name floor
-x 16
-y 14
+x 18
+y 16
 end
 arch fire_dragon
 name red dragon child
@@ -2117,159 +2574,342 @@ msg
 @match h[ae]llo|hi
 Hello!
 endmsg
-x 16
-y 14
+x 18
+y 16
 friendly 1
 unaggressive 1
 end
 arch afloor_right
 name floor
-x 16
-y 15
+x 18
+y 17
 end
 arch wall_2_1_2
-x 16
-y 15
+x 18
+y 17
+end
+arch grass_only
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch cobblestones2
+x 19
+end
+arch grass_only
+x 19
+y 1
 end
 arch afloor_right
 name floor
-x 17
+x 19
+y 2
 end
 arch wall_2_2_3
-x 17
-end
-arch afloor_right
-name floor
-x 17
-y 1
-end
-arch wall_2_1_1
-x 17
-y 1
-end
-arch afloor_right
-name floor
-x 17
-y 2
-end
-arch wall_2_1_1
-x 17
+x 19
 y 2
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 3
 end
 arch wall_2_1_1
-x 17
+x 19
 y 3
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 4
 end
 arch wall_2_1_1
-x 17
+x 19
 y 4
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 5
 end
 arch wall_2_1_1
-x 17
+x 19
 y 5
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 6
 end
 arch wall_2_1_1
-x 17
+x 19
 y 6
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 7
 end
 arch wall_2_1_1
-x 17
+x 19
 y 7
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 8
 end
 arch wall_2_1_1
-x 17
+x 19
 y 8
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 9
 end
 arch wall_2_1_1
-x 17
+x 19
 y 9
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 10
 end
 arch wall_2_1_1
-x 17
+x 19
 y 10
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 11
 end
 arch wall_2_1_1
-x 17
+x 19
 y 11
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 12
 end
 arch wall_2_1_1
-x 17
+x 19
 y 12
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 13
 end
 arch wall_2_1_1
-x 17
+x 19
 y 13
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 14
 end
 arch wall_2_1_1
-x 17
+x 19
 y 14
 end
 arch afloor_right
 name floor
-x 17
+x 19
 y 15
 end
+arch wall_2_1_1
+x 19
+y 15
+end
+arch afloor_right
+name floor
+x 19
+y 16
+end
+arch wall_2_1_1
+x 19
+y 16
+end
+arch afloor_right
+name floor
+x 19
+y 17
+end
 arch wall_2_2_4
-x 17
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch grass_only
+x 20
+y 2
+end
+arch grass_only
+x 20
+y 3
+end
+arch grass_only
+x 20
+y 4
+end
+arch grass_only
+x 20
+y 5
+end
+arch grass_only
+x 20
+y 6
+end
+arch grass_only
+x 20
+y 7
+end
+arch grass_only
+x 20
+y 8
+end
+arch grass_only
+x 20
+y 9
+end
+arch grass_only
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch grass_only
+x 20
+y 12
+end
+arch grass_only
+x 20
+y 13
+end
+arch grass_only
+x 20
+y 14
+end
+arch grass_only
+x 20
 y 15
 end
+arch grass_only
+x 20
+y 16
+end
+arch grass_only
+x 20
+y 17
+end
+arch grass_only
+x 20
+y 18
+end
+arch grass_only
+x 20
+y 19
+end
+arch cobblestones2
+x 21
+end
+arch cobblestones2
+x 21
+y 1
+end
+arch cobblestones2
+x 21
+y 2
+end
+arch cobblestones2
+x 21
+y 3
+end
+arch cobblestones2
+x 21
+y 4
+end
+arch cobblestones2
+x 21
+y 5
+end
+arch cobblestones2
+x 21
+y 6
+end
+arch cobblestones2
+x 21
+y 7
+end
+arch cobblestones2
+x 21
+y 8
+end
+arch cobblestones2
+x 21
+y 9
+end
+arch cobblestones2
+x 21
+y 10
+end
+arch cobblestones2
+x 21
+y 11
+end
+arch cobblestones2
+x 21
+y 12
+end
+arch cobblestones2
+x 21
+y 13
+end
+arch cobblestones2
+x 21
+y 14
+end
+arch cobblestones2
+x 21
+y 15
+end
+arch cobblestones2
+x 21
+y 16
+end
+arch cobblestones2
+x 21
+y 17
+end
+arch cobblestones2
+x 21
+y 18
+end
+arch cobblestones2
+x 21
+y 19
+end
diff --git a/world/world_103_127 b/world/world_103_127
index af01a0625..16d1e9533 100644
--- a/world/world_103_127
+++ b/world/world_103_127
@@ -4,7 +4,7 @@ region stoneville
 width 50
 height 50
 msg
-Modified: 2012-06-05 Rick Tanner
+Modified: 2012-06-06 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_103_126
@@ -528,8 +528,8 @@ end
 arch house_1
 name The Burning Adventurer
 slaying /dragonisland/tavern
-hp 8
-sp 15
+hp 10
+sp 17
 x 2
 y 15
 end