diff --git a/lake_country/sentrio_farmhouse b/lake_country/sentrio_farmhouse
index d17c6ee98..ec32ee287 100644
--- a/lake_country/sentrio_farmhouse
+++ b/lake_country/sentrio_farmhouse
@@ -2,13 +2,13 @@ arch map
 name Sentrio's farmhouse
 difficulty 35
 region lakecountry
-width 20
-height 20
-enter_x 4
-enter_y 18
+width 24
+height 24
+enter_x 6
+enter_y 20
 msg
 Created:  2007-05-23 Nicolas Weeger
-Modified: 2012-02-03 Rick Tanner
+Modified: 2020-07-31 Rick Tanner
 endmsg
 maplore
 @quest Lursendis
@@ -16,308 +16,573 @@ Place to get the eggs, assuming the player has the right items for that.
 endmaplore
 outdoor 1
 end
+arch grass
+end
+arch tree5
+end
+arch grass
+y 1
+end
+arch grass
+y 2
+end
+arch grass
+y 3
+end
+arch grass
+y 4
+end
+arch grass
+y 5
+end
+arch grass
+y 6
+end
+arch grass
+y 7
+end
+arch grass
+y 8
+end
+arch grass
+y 9
+end
+arch grass
+y 10
+end
+arch grass
+y 11
+end
+arch grass
+y 12
+end
+arch grass
+y 13
+end
+arch grass
+y 14
+end
+arch grass
+y 15
+end
+arch grass
+y 16
+end
+arch grass
+y 17
+end
+arch grass
+y 18
+end
+arch grass
+y 19
+end
+arch grass
+y 20
+end
+arch grass
+y 21
+end
+arch grass
+y 22
+end
+arch grass
+y 23
+end
+arch grass
+x 1
+end
+arch tree5
+x 1
+end
+arch grass
+x 1
+y 1
+end
+arch tree5
+x 1
+y 1
+end
+arch grass
+x 1
+y 2
+end
+arch grass
+x 1
+y 3
+end
+arch grass
+x 1
+y 4
+end
+arch grass
+x 1
+y 5
+end
+arch grass
+x 1
+y 6
+end
+arch grass
+x 1
+y 7
+end
+arch grass
+x 1
+y 8
+end
+arch grass
+x 1
+y 9
+end
+arch grass
+x 1
+y 10
+end
+arch grass
+x 1
+y 11
+end
+arch grass
+x 1
+y 12
+end
+arch grass
+x 1
+y 13
+end
+arch grass
+x 1
+y 14
+end
+arch grass
+x 1
+y 15
+end
+arch grass
+x 1
+y 16
+end
+arch grass
+x 1
+y 17
+end
+arch grass
+x 1
+y 18
+end
+arch grass
+x 1
+y 19
+end
+arch grass
+x 1
+y 20
+end
+arch grass
+x 1
+y 21
+end
+arch grass
+x 1
+y 22
+end
+arch grass
+x 1
+y 23
+end
+arch grass
+x 2
+end
+arch grass
+x 2
+y 1
+end
 arch woodfloor
+x 2
+y 2
 end
 arch woodwall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch woodwall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch woodwall_2_1_1
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
 arch woodwall_2_1_1
+x 2
 y 3
 end
 arch woodfloor
+x 2
 y 4
 end
-arch woodwall_3_2
+arch woodwall_2_1_1
+x 2
 y 4
 end
 arch woodfloor
+x 2
 y 5
 end
 arch woodwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor
+x 2
 y 6
 end
-arch woodwall_2_1_1
-y 6
-end
-arch woodfloor
-y 7
-end
-arch woodwall_2_1_1
-y 7
-end
-arch woodfloor
-y 8
-end
-arch woodwall_2_1_1
-y 8
-end
-arch woodfloor
-y 9
-end
-arch woodwall_2_1_1
-y 9
-end
-arch woodfloor
-y 10
-end
 arch woodwall_3_2
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch woodwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodwall_2_1_1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch woodwall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
+x 2
 y 10
 end
-arch small_stones
+arch woodwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
 y 11
 end
 arch woodwall_2_1_1
+x 2
 y 11
 end
-arch small_stones
+arch woodfloor
+x 2
 y 12
 end
-arch woodwall_2_1_1
+arch woodwall_3_2
+x 2
 y 12
 end
 arch small_stones
+x 2
 y 13
 end
 arch woodwall_2_1_1
+x 2
 y 13
 end
 arch small_stones
+x 2
 y 14
 end
 arch woodwall_2_1_1
+x 2
 y 14
 end
 arch small_stones
+x 2
 y 15
 end
 arch woodwall_2_1_1
+x 2
 y 15
 end
 arch small_stones
+x 2
 y 16
 end
 arch woodwall_2_1_1
+x 2
 y 16
 end
 arch small_stones
+x 2
 y 17
 end
 arch woodwall_2_1_1
+x 2
 y 17
 end
 arch small_stones
+x 2
 y 18
 end
 arch woodwall_2_1_1
+x 2
 y 18
 end
 arch small_stones
+x 2
 y 19
 end
+arch woodwall_2_1_1
+x 2
+y 19
+end
+arch small_stones
+x 2
+y 20
+end
+arch woodwall_2_1_1
+x 2
+y 20
+end
+arch small_stones
+x 2
+y 21
+end
 arch woodwall_2_2_1
-y 19
+x 2
+y 21
+end
+arch grass
+x 2
+y 22
+end
+arch grass
+x 2
+y 23
+end
+arch grass
+x 3
+end
+arch grass
+x 3
+y 1
+end
+arch tree5
+x 3
+y 1
 end
 arch woodfloor
-x 1
+x 3
+y 2
 end
 arch woodwall_2_1_2
-x 1
-end
-arch dirtfloor
-x 1
-y 1
-end
-arch random_food
-x 1
-y 1
-end
-arch dirtfloor
-x 1
-y 2
-end
-arch random_food
-x 1
+x 3
 y 2
 end
 arch dirtfloor
-x 1
+x 3
 y 3
 end
 arch random_food
-x 1
+x 3
 y 3
 end
 arch dirtfloor
-x 1
+x 3
 y 4
 end
-arch woodwall_1_3
-x 1
+arch random_food
+x 3
 y 4
 end
-arch woodfloor
-x 1
+arch dirtfloor
+x 3
 y 5
 end
-arch woodfloor
-x 1
+arch random_food
+x 3
+y 5
+end
+arch dirtfloor
+x 3
+y 6
+end
+arch woodwall_1_3
+x 3
 y 6
 end
 arch woodfloor
-x 1
+x 3
 y 7
 end
 arch woodfloor
-x 1
+x 3
 y 8
 end
 arch woodfloor
-x 1
+x 3
 y 9
 end
 arch woodfloor
-x 1
+x 3
 y 10
 end
-arch woodwall_2_1_2
-x 1
-y 10
-end
-arch small_stones
-x 1
+arch woodfloor
+x 3
 y 11
 end
-arch small_stones
-x 1
+arch woodfloor
+x 3
+y 12
+end
+arch woodwall_2_1_2
+x 3
 y 12
 end
 arch small_stones
-x 1
+x 3
 y 13
 end
 arch small_stones
-x 1
+x 3
 y 14
 end
 arch small_stones
-x 1
+x 3
 y 15
 end
 arch small_stones
-x 1
+x 3
 y 16
 end
 arch small_stones
-x 1
+x 3
 y 17
 end
 arch small_stones
-x 1
+x 3
 y 18
 end
 arch small_stones
-x 1
+x 3
 y 19
 end
+arch small_stones
+x 3
+y 20
+end
+arch small_stones
+x 3
+y 21
+end
 arch woodwall_2_1_2
-x 1
-y 19
+x 3
+y 21
+end
+arch grass
+x 3
+y 22
+end
+arch grass
+x 3
+y 23
+end
+arch grass
+x 4
+end
+arch tree5
+x 4
+end
+arch grass
+x 4
+y 1
 end
 arch woodfloor
-x 2
+x 4
+y 2
 end
 arch woodwall_2_1_2
-x 2
+x 4
+y 2
 end
 arch dirtfloor
-x 2
-y 1
+x 4
+y 3
 end
 arch random_plant
-x 2
-y 1
-end
-arch dirtfloor
-x 2
-y 2
-end
-arch random_food
-x 2
-y 2
-end
-arch dirtfloor
-x 2
-y 3
-end
-arch random_food
-x 2
+x 4
 y 3
 end
 arch dirtfloor
-x 2
+x 4
 y 4
 end
-arch woodfloor
-x 2
+arch random_food
+x 4
+y 4
+end
+arch dirtfloor
+x 4
 y 5
 end
-arch woodfloor
-x 2
-y 6
+arch random_food
+x 4
+y 5
 end
-arch woodwall_1_4
-x 2
+arch dirtfloor
+x 4
 y 6
 end
 arch woodfloor
-x 2
+x 4
 y 7
 end
 arch woodfloor
-x 2
+x 4
+y 8
+end
+arch woodwall_1_4
+x 4
 y 8
 end
 arch woodfloor
-x 2
+x 4
 y 9
 end
 arch woodfloor
-x 2
+x 4
 y 10
 end
-arch woodwall_2_1_2
-x 2
-y 10
-end
-arch small_stones
-x 2
+arch woodfloor
+x 4
 y 11
 end
-arch small_stones
-x 2
+arch woodfloor
+x 4
+y 12
+end
+arch woodwall_2_1_2
+x 4
 y 12
 end
 arch small_stones
-x 2
+x 4
 y 13
 end
+arch small_stones
+x 4
+y 14
+end
+arch small_stones
+x 4
+y 15
+end
 arch chicken
 name Combat Chicken
 msg
@@ -335,8 +600,8 @@ exp 90000
 dam 25
 wc -20
 ac -12
-x 2
-y 13
+x 4
+y 15
 speed -0.4
 attack_movement 32
 level 18
@@ -363,645 +628,787 @@ arch spell_comet
 end
 end
 arch small_stones
-x 2
-y 14
-end
-arch small_stones
-x 2
-y 15
-end
-arch small_stones
-x 2
+x 4
 y 16
 end
 arch small_stones
-x 2
+x 4
 y 17
 end
 arch small_stones
-x 2
+x 4
 y 18
 end
 arch small_stones
-x 2
+x 4
 y 19
 end
+arch small_stones
+x 4
+y 20
+end
+arch small_stones
+x 4
+y 21
+end
 arch woodwall_2_1_2
-x 2
-y 19
+x 4
+y 21
+end
+arch grass
+x 4
+y 22
+end
+arch grass
+x 4
+y 23
+end
+arch grass
+x 5
+end
+arch tree5
+x 5
+end
+arch grass
+x 5
+y 1
 end
 arch woodfloor
-x 3
+x 5
+y 2
 end
 arch woodwall_2_1_2
-x 3
+x 5
+y 2
 end
 arch dirtfloor
-x 3
-y 1
+x 5
+y 3
 end
 arch random_food
-x 3
-y 1
-end
-arch dirtfloor
-x 3
-y 2
-end
-arch random_plant
-x 3
-y 2
-end
-arch dirtfloor
-x 3
-y 3
-end
-arch random_plant
-x 3
+x 5
 y 3
 end
 arch dirtfloor
-x 3
+x 5
 y 4
 end
-arch woodwall_1_4
-x 3
+arch random_plant
+x 5
 y 4
 end
-arch woodfloor
-x 3
+arch dirtfloor
+x 5
 y 5
 end
-arch woodfloor
-x 3
+arch random_plant
+x 5
+y 5
+end
+arch dirtfloor
+x 5
 y 6
 end
+arch woodwall_1_4
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
 arch woodwall_2_2_3
-x 3
-y 6
-end
-arch woodfloor
-x 3
-y 7
-end
-arch woodwall_2_1_1
-x 3
-y 7
-end
-arch woodfloor
-x 3
-y 8
-end
-arch woodwall_2_1_1
-x 3
+x 5
 y 8
 end
 arch woodfloor
-x 3
+x 5
 y 9
 end
 arch woodwall_2_1_1
-x 3
+x 5
 y 9
 end
 arch woodfloor
-x 3
+x 5
 y 10
 end
+arch woodwall_2_1_1
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch woodwall_2_1_1
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
 arch woodwall_2_2_4
-x 3
-y 10
+x 5
+y 12
 end
 arch light2
-x 3
-y 10
-end
-arch small_stones
-x 3
-y 11
-end
-arch small_stones
-x 3
+x 5
 y 12
 end
 arch small_stones
-x 3
+x 5
 y 13
 end
 arch small_stones
-x 3
+x 5
 y 14
 end
 arch small_stones
-x 3
+x 5
 y 15
 end
 arch small_stones
-x 3
+x 5
 y 16
 end
 arch small_stones
-x 3
+x 5
 y 17
 end
 arch small_stones
-x 3
+x 5
 y 18
 end
 arch small_stones
-x 3
+x 5
 y 19
 end
+arch small_stones
+x 5
+y 20
+end
+arch small_stones
+x 5
+y 21
+end
 arch woodwall_1_3
-x 3
-y 19
+x 5
+y 21
+end
+arch dungeon_magic
+x 5
+y 22
+end
+arch grass
+x 5
+y 22
+move_block all
+end
+arch grass
+x 5
+y 23
+end
+arch grass
+x 6
+end
+arch tree5
+x 6
+end
+arch grass
+x 6
+y 1
 end
 arch woodfloor
-x 4
+x 6
+y 2
 end
 arch woodwall_3_3
-x 4
-end
-arch dirtfloor
-x 4
-y 1
-end
-arch woodwall_2_1_1
-x 4
-y 1
-end
-arch dirtfloor
-x 4
-y 2
-end
-arch woodwall_2_1_1
-x 4
+x 6
 y 2
 end
 arch dirtfloor
-x 4
+x 6
 y 3
 end
 arch woodwall_2_1_1
-x 4
+x 6
 y 3
 end
 arch dirtfloor
-x 4
+x 6
 y 4
 end
+arch woodwall_2_1_1
+x 6
+y 4
+end
+arch dirtfloor
+x 6
+y 5
+end
+arch woodwall_2_1_1
+x 6
+y 5
+end
+arch dirtfloor
+x 6
+y 6
+end
 arch woodwall_3_1
-x 4
-y 4
-end
-arch woodfloor
-x 4
-y 5
-end
-arch woodfloor
-x 4
+x 6
 y 6
 end
 arch woodfloor
-x 4
+x 6
 y 7
 end
 arch woodfloor
-x 4
+x 6
 y 8
 end
 arch woodfloor
-x 4
+x 6
 y 9
 end
 arch woodfloor
-x 4
+x 6
 y 10
 end
+arch woodfloor
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 12
+end
 arch door_look_1
-x 4
-y 10
+x 6
+y 12
 move_block 0
 end
 arch small_stones
-x 4
-y 11
-end
-arch small_stones
-x 4
-y 12
-end
-arch small_stones
-x 4
+x 6
 y 13
 end
 arch small_stones
-x 4
+x 6
 y 14
 end
 arch small_stones
-x 4
+x 6
 y 15
 end
 arch small_stones
-x 4
+x 6
 y 16
 end
 arch small_stones
-x 4
+x 6
 y 17
 end
 arch small_stones
-x 4
+x 6
 y 18
 end
+arch small_stones
+x 6
+y 19
+end
+arch small_stones
+x 6
+y 20
+end
 arch exit
 slaying /world/world_108_126
 hp 15
 sp 39
-x 4
-y 19
+x 6
+y 21
 end
 arch small_stones
-x 4
-y 19
+x 6
+y 21
 end
-arch woodfloor
-x 5
+arch dungeon_magic
+x 6
+y 22
 end
-arch woodwall_2_1_2
-x 5
+arch grass
+x 6
+y 22
+move_block all
 end
-arch woodfloor
-x 5
+arch grass
+x 6
+y 23
+end
+arch grass
+x 7
+end
+arch tree5
+x 7
+end
+arch grass
+x 7
+y 1
+end
+arch tree5
+x 7
 y 1
 end
 arch woodfloor
-x 5
+x 7
+y 2
+end
+arch woodwall_2_1_2
+x 7
 y 2
 end
 arch woodfloor
-x 5
+x 7
 y 3
 end
 arch woodfloor
-x 5
-y 4
-end
-arch woodwall_2_1_2
-x 5
+x 7
 y 4
 end
 arch woodfloor
-x 5
+x 7
 y 5
 end
 arch woodfloor
-x 5
+x 7
+y 6
+end
+arch woodwall_2_1_2
+x 7
 y 6
 end
 arch woodfloor
-x 5
+x 7
 y 7
 end
 arch woodfloor
-x 5
+x 7
 y 8
 end
 arch woodfloor
-x 5
+x 7
 y 9
 end
 arch woodfloor
-x 5
+x 7
 y 10
 end
+arch woodfloor
+x 7
+y 11
+end
+arch woodfloor
+x 7
+y 12
+end
 arch door_look_1
-x 5
-y 10
+x 7
+y 12
 move_block 0
 end
 arch small_stones
-x 5
-y 11
-end
-arch small_stones
-x 5
-y 12
-end
-arch small_stones
-x 5
+x 7
 y 13
 end
 arch small_stones
-x 5
+x 7
 y 14
 end
 arch small_stones
-x 5
+x 7
 y 15
 end
 arch small_stones
-x 5
+x 7
 y 16
 end
 arch small_stones
-x 5
+x 7
 y 17
 end
 arch small_stones
-x 5
+x 7
 y 18
 end
+arch small_stones
+x 7
+y 19
+end
+arch small_stones
+x 7
+y 20
+end
 arch exit
 slaying /world/world_108_126
 hp 15
 sp 39
-x 5
-y 19
+x 7
+y 21
 end
 arch small_stones
-x 5
-y 19
+x 7
+y 21
 end
-arch woodfloor
-x 6
+arch dungeon_magic
+x 7
+y 22
 end
-arch woodwall_2_1_2
-x 6
+arch grass
+x 7
+y 22
+move_block all
 end
-arch woodfloor
-x 6
+arch grass
+x 7
+y 23
+end
+arch grass
+x 8
+end
+arch grass
+x 8
 y 1
 end
 arch woodfloor
-x 6
+x 8
+y 2
+end
+arch woodwall_2_1_2
+x 8
 y 2
 end
 arch woodfloor
-x 6
+x 8
 y 3
 end
 arch woodfloor
-x 6
+x 8
 y 4
 end
+arch woodfloor
+x 8
+y 5
+end
+arch woodfloor
+x 8
+y 6
+end
 arch woodwall_1_3
-x 6
-y 4
-end
-arch woodfloor
-x 6
-y 5
-end
-arch woodfloor
-x 6
+x 8
 y 6
 end
 arch woodfloor
-x 6
+x 8
 y 7
 end
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
 arch woodwall_1_1
-x 6
-y 7
-end
-arch woodfloor
-x 6
-y 8
-end
-arch woodwall_2_1_1
-x 6
-y 8
-end
-arch woodfloor
-x 6
-y 9
-end
-arch woodwall_2_1_1
-x 6
+x 8
 y 9
 end
 arch woodfloor
-x 6
+x 8
 y 10
 end
+arch woodwall_2_1_1
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodwall_2_1_1
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
 arch woodwall_2_2_1
-x 6
-y 10
+x 8
+y 12
 end
 arch light2
-x 6
-y 10
-end
-arch small_stones
-x 6
-y 11
-end
-arch small_stones
-x 6
+x 8
 y 12
 end
 arch small_stones
-x 6
+x 8
 y 13
 end
 arch small_stones
-x 6
+x 8
 y 14
 end
 arch small_stones
-x 6
+x 8
 y 15
 end
 arch small_stones
-x 6
+x 8
 y 16
 end
 arch small_stones
-x 6
+x 8
 y 17
 end
 arch small_stones
-x 6
+x 8
 y 18
 end
 arch small_stones
-x 6
+x 8
 y 19
 end
+arch small_stones
+x 8
+y 20
+end
+arch small_stones
+x 8
+y 21
+end
 arch woodwall_1_4
-x 6
-y 19
+x 8
+y 21
 end
-arch woodfloor
-x 7
+arch dungeon_magic
+x 8
+y 22
 end
-arch woodwall_2_1_2
-x 7
+arch grass
+x 8
+y 22
+move_block all
 end
-arch woodfloor
-x 7
+arch grass
+x 8
+y 23
+end
+arch grass
+x 9
+end
+arch tree5
+x 9
+end
+arch grass
+x 9
 y 1
 end
 arch woodfloor
-x 7
+x 9
+y 2
+end
+arch woodwall_2_1_2
+x 9
 y 2
 end
 arch woodfloor
-x 7
+x 9
 y 3
 end
 arch woodfloor
-x 7
+x 9
 y 4
 end
 arch woodfloor
-x 7
+x 9
 y 5
 end
 arch woodfloor
-x 7
+x 9
 y 6
 end
 arch woodfloor
-x 7
+x 9
 y 7
 end
 arch woodfloor
-x 7
+x 9
 y 8
 end
 arch woodfloor
-x 7
+x 9
 y 9
 end
 arch woodfloor
-x 7
+x 9
 y 10
 end
-arch woodwall_2_1_2
-x 7
-y 10
-end
-arch small_stones
-x 7
+arch woodfloor
+x 9
 y 11
 end
-arch small_stones
-x 7
+arch woodfloor
+x 9
+y 12
+end
+arch woodwall_2_1_2
+x 9
 y 12
 end
 arch small_stones
-x 7
+x 9
 y 13
 end
 arch small_stones
-x 7
+x 9
 y 14
 end
 arch small_stones
-x 7
+x 9
 y 15
 end
 arch small_stones
-x 7
+x 9
 y 16
 end
 arch small_stones
-x 7
+x 9
 y 17
 end
 arch small_stones
-x 7
+x 9
 y 18
 end
 arch small_stones
-x 7
+x 9
 y 19
 end
-arch woodwall_2_1_2
-x 7
-y 19
+arch small_stones
+x 9
+y 20
 end
-arch woodfloor
-x 8
+arch small_stones
+x 9
+y 21
 end
 arch woodwall_2_1_2
-x 8
+x 9
+y 21
 end
-arch woodfloor
-x 8
+arch grass
+x 9
+y 22
+end
+arch grass
+x 9
+y 23
+end
+arch grass
+x 10
+end
+arch grass
+x 10
+y 1
+end
+arch tree5
+x 10
 y 1
 end
 arch woodfloor
-x 8
+x 10
+y 2
+end
+arch woodwall_2_1_2
+x 10
 y 2
 end
 arch woodfloor
-x 8
+x 10
 y 3
 end
 arch woodfloor
-x 8
+x 10
 y 4
 end
 arch woodfloor
-x 8
+x 10
 y 5
 end
 arch woodfloor
-x 8
+x 10
 y 6
 end
 arch woodfloor
-x 8
+x 10
 y 7
 end
 arch woodfloor
-x 8
+x 10
 y 8
 end
 arch woodfloor
-x 8
+x 10
 y 9
 end
 arch woodfloor
-x 8
+x 10
 y 10
 end
-arch woodwall_2_1_2
-x 8
-y 10
-end
-arch small_stones
-x 8
+arch woodfloor
+x 10
 y 11
 end
-arch small_stones
-x 8
+arch woodfloor
+x 10
+y 12
+end
+arch woodwall_2_1_2
+x 10
 y 12
 end
 arch small_stones
-x 8
+x 10
 y 13
 end
 arch small_stones
-x 8
+x 10
 y 14
 end
 arch small_stones
-x 8
+x 10
 y 15
 end
 arch small_stones
-x 8
+x 10
 y 16
 end
 arch small_stones
-x 8
+x 10
 y 17
 end
+arch small_stones
+x 10
+y 18
+end
+arch small_stones
+x 10
+y 19
+end
 arch chicken
 name Combat Chicken
 msg
@@ -1019,8 +1426,8 @@ exp 90000
 dam 25
 wc -20
 ac -12
-x 8
-y 17
+x 10
+y 19
 speed -0.4
 attack_movement 32
 level 18
@@ -1047,427 +1454,527 @@ arch spell_comet
 end
 end
 arch small_stones
-x 8
-y 18
+x 10
+y 20
 end
 arch small_stones
-x 8
-y 19
+x 10
+y 21
 end
 arch woodwall_2_1_2
-x 8
-y 19
+x 10
+y 21
 end
-arch woodfloor
-x 9
+arch grass
+x 10
+y 22
 end
-arch woodwall_2_1_2
-x 9
+arch grass
+x 10
+y 23
 end
-arch woodfloor
-x 9
+arch grass
+x 11
+end
+arch grass
+x 11
 y 1
 end
 arch woodfloor
-x 9
+x 11
+y 2
+end
+arch woodwall_2_1_2
+x 11
 y 2
 end
 arch woodfloor
-x 9
+x 11
 y 3
 end
 arch woodfloor
-x 9
+x 11
 y 4
 end
 arch woodfloor
-x 9
+x 11
 y 5
 end
 arch woodfloor
-x 9
+x 11
 y 6
 end
 arch woodfloor
-x 9
+x 11
 y 7
 end
 arch woodfloor
-x 9
+x 11
 y 8
 end
 arch woodfloor
-x 9
+x 11
 y 9
 end
 arch woodfloor
-x 9
+x 11
 y 10
 end
-arch woodwall_2_1_2
-x 9
-y 10
-end
-arch small_stones
-x 9
+arch woodfloor
+x 11
 y 11
 end
-arch small_stones
-x 9
+arch woodfloor
+x 11
+y 12
+end
+arch woodwall_2_1_2
+x 11
 y 12
 end
 arch small_stones
-x 9
+x 11
 y 13
 end
 arch small_stones
-x 9
+x 11
 y 14
 end
 arch small_stones
-x 9
+x 11
 y 15
 end
 arch small_stones
-x 9
+x 11
 y 16
 end
 arch small_stones
-x 9
+x 11
 y 17
 end
 arch small_stones
-x 9
+x 11
 y 18
 end
 arch small_stones
-x 9
+x 11
 y 19
 end
-arch woodwall_2_1_2
-x 9
-y 19
+arch small_stones
+x 11
+y 20
 end
-arch woodfloor
-x 10
+arch small_stones
+x 11
+y 21
 end
 arch woodwall_2_1_2
-x 10
+x 11
+y 21
 end
-arch woodfloor
-x 10
+arch grass
+x 11
+y 22
+end
+arch grass
+x 11
+y 23
+end
+arch grass
+x 12
+end
+arch tree5
+x 12
+end
+arch grass
+x 12
+y 1
+end
+arch tree5
+x 12
 y 1
 end
 arch woodfloor
-x 10
+x 12
+y 2
+end
+arch woodwall_2_1_2
+x 12
 y 2
 end
 arch woodfloor
-x 10
+x 12
 y 3
 end
 arch woodfloor
-x 10
+x 12
 y 4
 end
 arch woodfloor
-x 10
+x 12
 y 5
 end
 arch woodfloor
-x 10
+x 12
 y 6
 end
 arch woodfloor
-x 10
+x 12
 y 7
 end
 arch woodfloor
-x 10
+x 12
 y 8
 end
 arch woodfloor
-x 10
+x 12
 y 9
 end
 arch woodfloor
-x 10
+x 12
 y 10
 end
+arch woodfloor
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
 arch woodwall_3_3
-x 10
-y 10
-end
-arch woodfloor
-x 10
-y 11
-end
-arch woodwall_2_1_1
-x 10
-y 11
-end
-arch woodfloor
-x 10
-y 12
-end
-arch woodwall_2_1_1
-x 10
+x 12
 y 12
 end
 arch woodfloor
-x 10
+x 12
 y 13
 end
+arch woodwall_2_1_1
+x 12
+y 13
+end
+arch woodfloor
+x 12
+y 14
+end
+arch woodwall_2_1_1
+x 12
+y 14
+end
+arch woodfloor
+x 12
+y 15
+end
 arch woodwall_2_2_1
-x 10
-y 13
-end
-arch dirtfloor
-x 10
-y 14
-end
-arch dirtfloor
-x 10
+x 12
 y 15
 end
 arch dirtfloor
-x 10
+x 12
 y 16
 end
 arch dirtfloor
-x 10
+x 12
 y 17
 end
 arch dirtfloor
-x 10
+x 12
 y 18
 end
-arch woodfloor
-x 10
+arch dirtfloor
+x 12
 y 19
 end
-arch woodwall_2_1_2
-x 10
-y 19
+arch dirtfloor
+x 12
+y 20
 end
 arch woodfloor
-x 11
+x 12
+y 21
 end
 arch woodwall_2_1_2
-x 11
+x 12
+y 21
 end
-arch woodfloor
-x 11
+arch grass
+x 12
+y 22
+end
+arch grass
+x 12
+y 23
+end
+arch grass
+x 13
+end
+arch grass
+x 13
+y 1
+end
+arch tree5
+x 13
 y 1
 end
 arch woodfloor
-x 11
+x 13
+y 2
+end
+arch woodwall_2_1_2
+x 13
 y 2
 end
 arch woodfloor
-x 11
+x 13
 y 3
 end
 arch woodfloor
-x 11
+x 13
 y 4
 end
 arch woodfloor
-x 11
+x 13
 y 5
 end
 arch woodfloor
-x 11
+x 13
 y 6
 end
 arch woodfloor
-x 11
+x 13
 y 7
 end
 arch woodfloor
-x 11
+x 13
 y 8
 end
 arch woodfloor
-x 11
+x 13
 y 9
 end
 arch woodfloor
-x 11
-y 10
-end
-arch woodwall_2_1_2
-x 11
+x 13
 y 10
 end
 arch woodfloor
-x 11
+x 13
 y 11
 end
+arch woodfloor
+x 13
+y 12
+end
+arch woodwall_2_1_2
+x 13
+y 12
+end
+arch woodfloor
+x 13
+y 13
+end
 arch bed_1
-x 11
-y 11
-end
-arch woodfloor
-x 11
-y 12
-end
-arch woodfloor
-x 11
+x 13
 y 13
 end
-arch woodwall_2_1_2
-x 11
-y 13
-end
-arch dirtfloor
-x 11
+arch woodfloor
+x 13
 y 14
 end
-arch dirtfloor
-x 11
+arch woodfloor
+x 13
+y 15
+end
+arch woodwall_2_1_2
+x 13
 y 15
 end
 arch dirtfloor
-x 11
+x 13
 y 16
 end
 arch dirtfloor
-x 11
+x 13
 y 17
 end
 arch dirtfloor
-x 11
+x 13
 y 18
 end
-arch woodfloor
-x 11
+arch dirtfloor
+x 13
 y 19
 end
-arch woodwall_2_1_2
-x 11
-y 19
+arch dirtfloor
+x 13
+y 20
 end
 arch woodfloor
-x 12
+x 13
+y 21
 end
 arch woodwall_2_1_2
-x 12
+x 13
+y 21
 end
-arch woodfloor
-x 12
+arch grass
+x 13
+y 22
+end
+arch grass
+x 13
+y 23
+end
+arch grass
+x 14
+end
+arch grass
+x 14
 y 1
 end
 arch woodfloor
-x 12
+x 14
+y 2
+end
+arch woodwall_2_1_2
+x 14
 y 2
 end
 arch woodfloor
-x 12
+x 14
 y 3
 end
 arch woodfloor
-x 12
+x 14
 y 4
 end
 arch woodfloor
-x 12
+x 14
 y 5
 end
 arch woodfloor
-x 12
+x 14
 y 6
 end
 arch woodfloor
-x 12
+x 14
 y 7
 end
 arch woodfloor
-x 12
+x 14
 y 8
 end
 arch woodfloor
-x 12
+x 14
 y 9
 end
 arch woodfloor
-x 12
-y 10
-end
-arch woodwall_1_3
-x 12
+x 14
 y 10
 end
 arch woodfloor
-x 12
+x 14
 y 11
 end
 arch woodfloor
-x 12
+x 14
+y 12
+end
+arch woodwall_1_3
+x 14
 y 12
 end
 arch woodfloor
-x 12
+x 14
 y 13
 end
-arch woodwall_2_1_2
-x 12
-y 13
-end
-arch dirtfloor
-x 12
+arch woodfloor
+x 14
 y 14
 end
-arch dirtfloor
-x 12
+arch woodfloor
+x 14
+y 15
+end
+arch woodwall_2_1_2
+x 14
 y 15
 end
 arch dirtfloor
-x 12
+x 14
 y 16
 end
 arch dirtfloor
-x 12
+x 14
 y 17
 end
 arch dirtfloor
-x 12
+x 14
 y 18
 end
-arch woodfloor
-x 12
+arch dirtfloor
+x 14
 y 19
 end
-arch woodwall_2_1_2
-x 12
-y 19
+arch dirtfloor
+x 14
+y 20
 end
 arch woodfloor
-x 13
+x 14
+y 21
 end
 arch woodwall_2_1_2
-x 13
+x 14
+y 21
 end
-arch woodfloor
-x 13
+arch grass
+x 14
+y 22
+end
+arch grass
+x 14
+y 23
+end
+arch grass
+x 15
+end
+arch grass
+x 15
+y 1
+end
+arch tree5
+x 15
 y 1
 end
 arch woodfloor
-x 13
+x 15
+y 2
+end
+arch woodwall_2_1_2
+x 15
 y 2
 end
 arch woodfloor
-x 13
+x 15
 y 3
 end
 arch woodfloor
-x 13
+x 15
 y 4
 end
 arch woodfloor
-x 13
+x 15
 y 5
 end
+arch woodfloor
+x 15
+y 6
+end
+arch woodfloor
+x 15
+y 7
+end
 arch woman
 name Sentrio's farmer
 msg
@@ -1484,378 +1991,214 @@ Yes, those are special chicken, trained for combat.  Trust me, you don't want to
 @match *
 Hello, I don't often see visitors.  Please feel free to look around, but don't bother the chickens, please.
 endmsg
-x 13
-y 5
-end
-arch woodfloor
-x 13
-y 6
-end
-arch woodfloor
-x 13
+x 15
 y 7
 end
 arch woodfloor
-x 13
+x 15
 y 8
 end
 arch woodfloor
-x 13
+x 15
 y 9
 end
 arch woodfloor
-x 13
+x 15
 y 10
 end
 arch woodfloor
-x 13
+x 15
 y 11
 end
 arch woodfloor
-x 13
+x 15
 y 12
 end
 arch woodfloor
-x 13
+x 15
 y 13
 end
-arch woodwall_2_1_2
-x 13
-y 13
-end
-arch dirtfloor
-x 13
+arch woodfloor
+x 15
 y 14
 end
-arch dirtfloor
-x 13
+arch woodfloor
+x 15
+y 15
+end
+arch woodwall_2_1_2
+x 15
 y 15
 end
 arch dirtfloor
-x 13
+x 15
 y 16
 end
 arch dirtfloor
-x 13
+x 15
 y 17
 end
 arch dirtfloor
-x 13
+x 15
 y 18
 end
-arch woodfloor
-x 13
+arch dirtfloor
+x 15
 y 19
 end
-arch woodwall_2_1_2
-x 13
-y 19
+arch dirtfloor
+x 15
+y 20
 end
 arch woodfloor
-x 14
+x 15
+y 21
 end
 arch woodwall_2_1_2
-x 14
+x 15
+y 21
 end
-arch woodfloor
-x 14
+arch grass
+x 15
+y 22
+end
+arch grass
+x 15
+y 23
+end
+arch grass
+x 16
+end
+arch tree5
+x 16
+end
+arch grass
+x 16
 y 1
 end
 arch woodfloor
-x 14
+x 16
+y 2
+end
+arch woodwall_2_1_2
+x 16
 y 2
 end
 arch woodfloor
-x 14
+x 16
 y 3
 end
 arch woodfloor
-x 14
+x 16
 y 4
 end
 arch woodfloor
-x 14
+x 16
 y 5
 end
 arch woodfloor
-x 14
+x 16
 y 6
 end
 arch woodfloor
-x 14
+x 16
 y 7
 end
 arch woodfloor
-x 14
+x 16
 y 8
 end
 arch woodfloor
-x 14
+x 16
 y 9
 end
 arch woodfloor
-x 14
+x 16
 y 10
 end
+arch woodfloor
+x 16
+y 11
+end
+arch woodfloor
+x 16
+y 12
+end
 arch woodwall_1_4
-x 14
-y 10
-end
-arch woodfloor
-x 14
-y 11
-end
-arch bookshelf
-x 14
-y 11
-end
-arch woodfloor
-x 14
+x 16
 y 12
 end
 arch woodfloor
-x 14
+x 16
 y 13
 end
-arch woodwall_2_1_2
-x 14
+arch bookshelf
+x 16
 y 13
 end
-arch dirtfloor
-x 14
+arch woodfloor
+x 16
 y 14
 end
-arch dirtfloor
-x 14
+arch woodfloor
+x 16
+y 15
+end
+arch woodwall_2_1_2
+x 16
 y 15
 end
 arch dirtfloor
-x 14
+x 16
 y 16
 end
 arch dirtfloor
-x 14
+x 16
 y 17
 end
 arch dirtfloor
-x 14
+x 16
 y 18
 end
-arch woodfloor
-x 14
+arch dirtfloor
+x 16
 y 19
 end
-arch woodwall_2_1_2
-x 14
-y 19
+arch dirtfloor
+x 16
+y 20
 end
 arch woodfloor
-x 15
+x 16
+y 21
 end
 arch woodwall_2_1_2
-x 15
+x 16
+y 21
 end
-arch woodfloor
-x 15
+arch grass
+x 16
+y 22
+end
+arch grass
+x 16
+y 23
+end
+arch grass
+x 17
+end
+arch tree5
+x 17
+end
+arch grass
+x 17
 y 1
 end
 arch woodfloor
-x 15
+x 17
 y 2
 end
-arch woodfloor
-x 15
-y 3
-end
-arch woodfloor
-x 15
-y 4
-end
-arch woodfloor
-x 15
-y 5
-end
-arch woodfloor
-x 15
-y 6
-end
-arch woodfloor
-x 15
-y 7
-end
-arch woodfloor
-x 15
-y 8
-end
-arch woodfloor
-x 15
-y 9
-end
-arch woodfloor
-x 15
-y 10
-end
 arch woodwall_2_1_2
-x 15
-y 10
-end
-arch woodfloor
-x 15
-y 11
-end
-arch bookshelf
-x 15
-y 11
-end
-arch woodfloor
-x 15
-y 12
-end
-arch woodfloor
-x 15
-y 13
-end
-arch woodwall_2_1_2
-x 15
-y 13
-end
-arch dirtfloor
-x 15
-y 14
-end
-arch dirtfloor
-x 15
-y 15
-end
-arch dirtfloor
-x 15
-y 16
-end
-arch dirtfloor
-x 15
-y 17
-end
-arch dirtfloor
-x 15
-y 18
-end
-arch woodfloor
-x 15
-y 19
-end
-arch woodwall_2_1_2
-x 15
-y 19
-end
-arch woodfloor
-x 16
-end
-arch woodwall_2_1_2
-x 16
-end
-arch woodfloor
-x 16
-y 1
-end
-arch woodfloor
-x 16
-y 2
-end
-arch woodfloor
-x 16
-y 3
-end
-arch woodfloor
-x 16
-y 4
-end
-arch woodfloor
-x 16
-y 5
-end
-arch woodfloor
-x 16
-y 6
-end
-arch woodfloor
-x 16
-y 7
-end
-arch woodfloor
-x 16
-y 8
-end
-arch woodfloor
-x 16
-y 9
-end
-arch woodfloor
-x 16
-y 10
-end
-arch woodwall_2_1_2
-x 16
-y 10
-end
-arch woodfloor
-x 16
-y 11
-end
-arch bookshelf
-x 16
-y 11
-end
-arch woodfloor
-x 16
-y 12
-end
-arch woodfloor
-x 16
-y 13
-end
-arch woodwall_2_1_2
-x 16
-y 13
-end
-arch dirtfloor
-x 16
-y 14
-end
-arch dirtfloor
-x 16
-y 15
-end
-arch dirtfloor
-x 16
-y 16
-end
-arch dirtfloor
-x 16
-y 17
-end
-arch dirtfloor
-x 16
-y 18
-end
-arch woodfloor
-x 16
-y 19
-end
-arch woodwall_2_1_2
-x 16
-y 19
-end
-arch woodfloor
-x 17
-end
-arch woodwall_2_1_2
-x 17
-end
-arch woodfloor
-x 17
-y 1
-end
-arch woodfloor
 x 17
 y 2
 end
@@ -1891,43 +2234,35 @@ arch woodfloor
 x 17
 y 10
 end
-arch woodwall_2_1_2
-x 17
-y 10
-end
 arch woodfloor
 x 17
 y 11
 end
-arch bookshelf
-x 17
-y 11
-end
 arch woodfloor
 x 17
 y 12
 end
+arch woodwall_2_1_2
+x 17
+y 12
+end
 arch woodfloor
 x 17
 y 13
 end
-arch woodwall_2_1_2
+arch bookshelf
 x 17
 y 13
 end
-arch dirtfloor
+arch woodfloor
 x 17
 y 14
 end
-arch random_plant
-x 17
-y 14
-end
-arch dirtfloor
+arch woodfloor
 x 17
 y 15
 end
-arch random_food
+arch woodwall_2_1_2
 x 17
 y 15
 end
@@ -1935,71 +2270,344 @@ arch dirtfloor
 x 17
 y 16
 end
+arch dirtfloor
+x 17
+y 17
+end
+arch dirtfloor
+x 17
+y 18
+end
+arch dirtfloor
+x 17
+y 19
+end
+arch dirtfloor
+x 17
+y 20
+end
+arch woodfloor
+x 17
+y 21
+end
+arch woodwall_2_1_2
+x 17
+y 21
+end
+arch grass
+x 17
+y 22
+end
+arch grass
+x 17
+y 23
+end
+arch grass
+x 18
+end
+arch grass
+x 18
+y 1
+end
+arch woodfloor
+x 18
+y 2
+end
+arch woodwall_2_1_2
+x 18
+y 2
+end
+arch woodfloor
+x 18
+y 3
+end
+arch woodfloor
+x 18
+y 4
+end
+arch woodfloor
+x 18
+y 5
+end
+arch woodfloor
+x 18
+y 6
+end
+arch woodfloor
+x 18
+y 7
+end
+arch woodfloor
+x 18
+y 8
+end
+arch woodfloor
+x 18
+y 9
+end
+arch woodfloor
+x 18
+y 10
+end
+arch woodfloor
+x 18
+y 11
+end
+arch woodfloor
+x 18
+y 12
+end
+arch woodwall_2_1_2
+x 18
+y 12
+end
+arch woodfloor
+x 18
+y 13
+end
+arch bookshelf
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch woodfloor
+x 18
+y 15
+end
+arch woodwall_2_1_2
+x 18
+y 15
+end
+arch dirtfloor
+x 18
+y 16
+end
+arch dirtfloor
+x 18
+y 17
+end
+arch dirtfloor
+x 18
+y 18
+end
+arch dirtfloor
+x 18
+y 19
+end
+arch dirtfloor
+x 18
+y 20
+end
+arch woodfloor
+x 18
+y 21
+end
+arch woodwall_2_1_2
+x 18
+y 21
+end
+arch grass
+x 18
+y 22
+end
+arch grass
+x 18
+y 23
+end
+arch grass
+x 19
+end
+arch tree5
+x 19
+end
+arch grass
+x 19
+y 1
+end
+arch woodfloor
+x 19
+y 2
+end
+arch woodwall_2_1_2
+x 19
+y 2
+end
+arch woodfloor
+x 19
+y 3
+end
+arch woodfloor
+x 19
+y 4
+end
+arch woodfloor
+x 19
+y 5
+end
+arch woodfloor
+x 19
+y 6
+end
+arch woodfloor
+x 19
+y 7
+end
+arch woodfloor
+x 19
+y 8
+end
+arch woodfloor
+x 19
+y 9
+end
+arch woodfloor
+x 19
+y 10
+end
+arch woodfloor
+x 19
+y 11
+end
+arch woodfloor
+x 19
+y 12
+end
+arch woodwall_2_1_2
+x 19
+y 12
+end
+arch woodfloor
+x 19
+y 13
+end
+arch bookshelf
+x 19
+y 13
+end
+arch woodfloor
+x 19
+y 14
+end
+arch woodfloor
+x 19
+y 15
+end
+arch woodwall_2_1_2
+x 19
+y 15
+end
+arch dirtfloor
+x 19
+y 16
+end
 arch random_plant
-x 17
+x 19
 y 16
 end
 arch dirtfloor
-x 17
+x 19
 y 17
 end
 arch random_food
-x 17
+x 19
 y 17
 end
 arch dirtfloor
-x 17
+x 19
 y 18
 end
 arch random_plant
-x 17
+x 19
 y 18
 end
-arch woodfloor
-x 17
+arch dirtfloor
+x 19
 y 19
 end
-arch woodwall_2_1_2
-x 17
+arch random_food
+x 19
 y 19
 end
+arch dirtfloor
+x 19
+y 20
+end
+arch random_plant
+x 19
+y 20
+end
 arch woodfloor
-x 18
+x 19
+y 21
 end
 arch woodwall_2_1_2
-x 18
+x 19
+y 21
 end
-arch woodfloor
-x 18
+arch grass
+x 19
+y 22
+end
+arch grass
+x 19
+y 23
+end
+arch grass
+x 20
+end
+arch tree5
+x 20
+end
+arch grass
+x 20
 y 1
 end
+arch tree5
+x 20
+y 1
+end
+arch woodfloor
+x 20
+y 2
+end
+arch woodwall_2_1_2
+x 20
+y 2
+end
+arch woodfloor
+x 20
+y 3
+end
 arch clock_grand
-x 18
-y 1
-end
-arch woodfloor
-x 18
-y 2
-end
-arch woodfloor
-x 18
+x 20
 y 3
 end
 arch woodfloor
-x 18
+x 20
 y 4
 end
 arch woodfloor
-x 18
+x 20
 y 5
 end
 arch woodfloor
-x 18
+x 20
 y 6
 end
+arch woodfloor
+x 20
+y 7
+end
+arch woodfloor
+x 20
+y 8
+end
 arch desk
-x 18
-y 6
+x 20
+y 8
 no_pick 1
 arch scroll
 name invoice
@@ -2018,248 +2626,470 @@ endmsg
 end
 end
 arch woodfloor
-x 18
-y 7
-end
-arch woodfloor
-x 18
-y 8
-end
-arch woodfloor
-x 18
+x 20
 y 9
 end
 arch woodfloor
-x 18
-y 10
-end
-arch woodwall_2_1_2
-x 18
+x 20
 y 10
 end
 arch woodfloor
-x 18
+x 20
 y 11
 end
+arch woodfloor
+x 20
+y 12
+end
+arch woodwall_2_1_2
+x 20
+y 12
+end
+arch woodfloor
+x 20
+y 13
+end
 arch bookshelf
-x 18
-y 11
-end
-arch woodfloor
-x 18
-y 12
-end
-arch woodfloor
-x 18
+x 20
 y 13
 end
-arch woodwall_2_1_2
-x 18
-y 13
-end
-arch dirtfloor
-x 18
+arch woodfloor
+x 20
 y 14
 end
-arch random_food
-x 18
-y 14
-end
-arch dirtfloor
-x 18
+arch woodfloor
+x 20
 y 15
 end
-arch random_plant
-x 18
+arch woodwall_2_1_2
+x 20
 y 15
 end
 arch dirtfloor
-x 18
+x 20
 y 16
 end
 arch random_food
-x 18
+x 20
 y 16
 end
 arch dirtfloor
-x 18
+x 20
 y 17
 end
 arch random_plant
-x 18
+x 20
 y 17
 end
 arch dirtfloor
-x 18
+x 20
 y 18
 end
 arch random_food
-x 18
+x 20
 y 18
 end
-arch woodfloor
-x 18
+arch dirtfloor
+x 20
 y 19
 end
+arch random_plant
+x 20
+y 19
+end
+arch dirtfloor
+x 20
+y 20
+end
+arch random_food
+x 20
+y 20
+end
+arch woodfloor
+x 20
+y 21
+end
 arch woodwall_2_1_2
-x 18
-y 19
+x 20
+y 21
+end
+arch grass
+x 20
+y 22
+end
+arch grass
+x 20
+y 23
+end
+arch grass
+x 21
+end
+arch grass
+x 21
+y 1
 end
 arch woodfloor
-x 19
+x 21
+y 2
 end
 arch woodwall_2_2_3
-x 19
-end
-arch woodfloor
-x 19
-y 1
-end
-arch woodwall_2_1_1
-x 19
-y 1
-end
-arch woodfloor
-x 19
-y 2
-end
-arch woodwall_2_1_1
-x 19
+x 21
 y 2
 end
 arch woodfloor
-x 19
+x 21
 y 3
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 3
 end
 arch woodfloor
-x 19
+x 21
 y 4
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 4
 end
 arch woodfloor
-x 19
+x 21
 y 5
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 5
 end
 arch woodfloor
-x 19
+x 21
 y 6
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 6
 end
 arch woodfloor
-x 19
+x 21
 y 7
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 7
 end
 arch woodfloor
-x 19
+x 21
 y 8
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 8
 end
 arch woodfloor
-x 19
+x 21
 y 9
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 9
 end
 arch woodfloor
-x 19
+x 21
 y 10
 end
-arch woodwall_3_4
-x 19
+arch woodwall_2_1_1
+x 21
 y 10
 end
 arch woodfloor
-x 19
+x 21
 y 11
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 11
 end
 arch woodfloor
-x 19
+x 21
 y 12
 end
-arch woodwall_2_1_1
-x 19
-y 12
-end
-arch woodfloor
-x 19
-y 13
-end
 arch woodwall_3_4
-x 19
+x 21
+y 12
+end
+arch woodfloor
+x 21
+y 13
+end
+arch woodwall_2_1_1
+x 21
 y 13
 end
 arch woodfloor
-x 19
+x 21
 y 14
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 14
 end
 arch woodfloor
-x 19
+x 21
 y 15
 end
-arch woodwall_2_1_1
-x 19
+arch woodwall_3_4
+x 21
 y 15
 end
 arch woodfloor
-x 19
+x 21
 y 16
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 16
 end
 arch woodfloor
-x 19
+x 21
 y 17
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 17
 end
 arch woodfloor
-x 19
+x 21
 y 18
 end
 arch woodwall_2_1_1
-x 19
+x 21
 y 18
 end
 arch woodfloor
-x 19
+x 21
 y 19
 end
+arch woodwall_2_1_1
+x 21
+y 19
+end
+arch woodfloor
+x 21
+y 20
+end
+arch woodwall_2_1_1
+x 21
+y 20
+end
+arch woodfloor
+x 21
+y 21
+end
 arch woodwall_2_2_4
-x 19
+x 21
+y 21
+end
+arch grass
+x 21
+y 22
+end
+arch grass
+x 21
+y 23
+end
+arch grass
+x 22
+end
+arch tree5
+x 22
+end
+arch grass
+x 22
+y 1
+end
+arch tree5
+x 22
+y 1
+end
+arch grass
+x 22
+y 2
+end
+arch grass
+x 22
+y 3
+end
+arch grass
+x 22
+y 4
+end
+arch grass
+x 22
+y 5
+end
+arch grass
+x 22
+y 6
+end
+arch grass
+x 22
+y 7
+end
+arch grass
+x 22
+y 8
+end
+arch grass
+x 22
+y 9
+end
+arch grass
+x 22
+y 10
+end
+arch grass
+x 22
+y 11
+end
+arch grass
+x 22
+y 12
+end
+arch grass
+x 22
+y 13
+end
+arch grass
+x 22
+y 14
+end
+arch grass
+x 22
+y 15
+end
+arch grass
+x 22
+y 16
+end
+arch grass
+x 22
+y 17
+end
+arch grass
+x 22
+y 18
+end
+arch grass
+x 22
 y 19
 end
+arch grass
+x 22
+y 20
+end
+arch grass
+x 22
+y 21
+end
+arch grass
+x 22
+y 22
+end
+arch grass
+x 22
+y 23
+end
+arch grass
+x 23
+end
+arch grass
+x 23
+y 1
+end
+arch grass
+x 23
+y 2
+end
+arch grass
+x 23
+y 3
+end
+arch grass
+x 23
+y 4
+end
+arch grass
+x 23
+y 5
+end
+arch grass
+x 23
+y 6
+end
+arch grass
+x 23
+y 7
+end
+arch grass
+x 23
+y 8
+end
+arch grass
+x 23
+y 9
+end
+arch grass
+x 23
+y 10
+end
+arch grass
+x 23
+y 11
+end
+arch grass
+x 23
+y 12
+end
+arch grass
+x 23
+y 13
+end
+arch grass
+x 23
+y 14
+end
+arch grass
+x 23
+y 15
+end
+arch grass
+x 23
+y 16
+end
+arch grass
+x 23
+y 17
+end
+arch grass
+x 23
+y 18
+end
+arch grass
+x 23
+y 19
+end
+arch grass
+x 23
+y 20
+end
+arch grass
+x 23
+y 21
+end
+arch grass
+x 23
+y 22
+end
+arch grass
+x 23
+y 23
+end
diff --git a/world/world_108_126 b/world/world_108_126
index e9f2f36c4..85bbcd836 100644
--- a/world/world_108_126
+++ b/world/world_108_126
@@ -3,7 +3,7 @@ name world_108_126
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2020-07-31 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_108_125
@@ -4192,8 +4192,8 @@ end
 arch rl_house_west
 name Sentrio's farmhouse
 slaying /lake_country/sentrio_farmhouse
-hp 4
-sp 18
+hp 6
+sp 20
 x 15
 y 38
 end