diff --git a/navar_city/houses/avashouse b/navar_city/houses/avashouse
index 0696f4b03..4d6883a7e 100644
--- a/navar_city/houses/avashouse
+++ b/navar_city/houses/avashouse
@@ -2,112 +2,101 @@ arch map
 name Ava's House
 difficulty 1
 region navar
-width 7
-height 9
-enter_x 4
-enter_y 6
+width 13
+height 12
+enter_x 6
+enter_y 8
 msg
 Created:  2012-03-20 Rick Tanner
-Modified: 2012-05-16 Rick Tanner
+Modified: 2012-07-10 Rick Tanner
 endmsg
 end
-arch blocked
+arch cobblestones2
 end
-arch blocked
+arch cobblestones2
 y 1
 end
-arch blocked
+arch cobblestones2
 y 2
 end
-arch blocked
+arch cobblestones2
 y 3
 end
-arch blocked
+arch cobblestones2
 y 4
 end
-arch blocked
+arch cobblestones2
 y 5
 end
-arch blocked
+arch cobblestones2
 y 6
 end
-arch blocked
+arch cobblestones2
 y 7
 end
-arch blocked
+arch cobblestones2
 y 8
 end
-arch blocked
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch grass_only
 x 1
 end
-arch woodfloor
+arch grass_only
 x 1
 y 1
 end
-arch wwall_2_2_2
-x 1
-y 1
-end
-arch woodfloor
+arch grass_only
 x 1
 y 2
 end
-arch wwall_2_1_1
-x 1
-y 2
-end
-arch woodfloor
+arch grass_only
 x 1
 y 3
 end
-arch wwall_2_1_1
-x 1
-y 3
-end
-arch woodfloor
+arch grass_only
 x 1
 y 4
 end
-arch wwall_2_1_1
-x 1
-y 4
-end
-arch woodfloor
+arch grass_only
 x 1
 y 5
 end
-arch wwall_2_1_1
-x 1
-y 5
-end
-arch woodfloor
+arch grass_only
 x 1
 y 6
 end
-arch wwall_2_1_1
-x 1
-y 6
-end
-arch woodfloor
+arch grass_only
 x 1
 y 7
 end
-arch wwall_2_2_1
-x 1
-y 7
-end
-arch blocked
+arch grass_only
 x 1
 y 8
 end
-arch blocked
+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 2
 end
-arch woodfloor
-x 2
-y 1
-end
-arch wwall_2_1_2
+arch grass_only
 x 2
 y 1
 end
@@ -115,243 +104,720 @@ arch woodfloor
 x 2
 y 2
 end
+arch white_wall_2_2_2
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 3
+end
+arch white_wall_2_1_1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch white_wall_2_1_1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch white_wall_2_1_1
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch white_wall_3_2
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch white_wall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch white_wall_2_1_1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch white_wall_2_2_1
+x 2
+y 9
+end
+arch grass_only
+x 2
+y 10
+end
+arch grass_only
+x 2
+y 11
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch woodfloor
+x 3
+y 2
+end
+arch white_wall_2_1_2
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
 arch chair_1.1
-x 2
-y 2
+x 3
+y 3
 end
 arch c_woman
 name Ava
-x 2
-y 2
-end
-arch woodfloor
-x 2
+x 3
 y 3
 end
 arch woodfloor
-x 2
+x 3
 y 4
 end
 arch woodfloor
-x 2
+x 3
 y 5
 end
 arch woodfloor
-x 2
+x 3
 y 6
 end
-arch chest
-x 2
+arch white_wall_1_3
+x 3
 y 6
 end
 arch woodfloor
-x 2
+x 3
 y 7
 end
-arch wwall_2_1_2
-x 2
-y 7
-end
-arch blocked
-x 2
+arch woodfloor
+x 3
 y 8
 end
-arch blocked
+arch chair_1.4
 x 3
+y 8
 end
 arch woodfloor
 x 3
-y 1
+y 9
 end
-arch wwall_2_1_2
+arch white_wall_2_1_2
 x 3
+y 9
+end
+arch grass_only
+x 3
+y 10
+end
+arch grass_only
+x 3
+y 11
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
 arch woodfloor
-x 3
+x 4
 y 2
 end
+arch white_wall_2_1_2
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 3
+end
 arch table_4
-x 3
-y 2
-end
-arch woodfloor
-x 3
+x 4
 y 3
 end
 arch woodfloor
-x 3
+x 4
 y 4
 end
 arch woodfloor
-x 3
+x 4
 y 5
 end
 arch woodfloor
-x 3
+x 4
+y 6
+end
+arch door_2
+x 4
 y 6
 end
 arch woodfloor
-x 3
+x 4
 y 7
 end
-arch wwall_2_1_2
-x 3
-y 7
-end
-arch blocked
-x 3
+arch woodfloor
+x 4
 y 8
 end
-arch blocked
+arch table
 x 4
+y 8
 end
 arch woodfloor
 x 4
-y 1
+y 9
 end
-arch wwall_2_1_2
+arch white_wall_2_1_2
 x 4
+y 9
+end
+arch grass_only
+x 4
+y 10
+end
+arch grass_only
+x 4
+y 11
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
 arch woodfloor
-x 4
+x 5
+y 2
+end
+arch white_wall_2_1_2
+x 5
 y 2
 end
 arch woodfloor
-x 4
+x 5
+y 3
+end
+arch bed_1
+x 5
 y 3
 end
 arch woodfloor
-x 4
-y 4
-end
-arch bed_1
-x 4
+x 5
 y 4
 end
 arch woodfloor
-x 4
+x 5
 y 5
 end
 arch woodfloor
-x 4
+x 5
 y 6
 end
-arch oakdoor
+arch white_wall_1_4
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch white_wall_1_3
+x 5
+y 9
+end
+arch dungeon_magic
+x 5
+y 10
+end
+arch grass_only
+x 5
+y 10
+move_block all
+end
+arch grass_only
+x 5
+y 11
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch white_wall_3_3
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch white_wall_2_1_1
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch white_wall_2_1_1
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch white_wall_2_1_1
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch white_wall_3_1
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch oakdoor_2
 slaying /world/world_122_116
 hp 10
 sp 42
-x 4
-y 6
+x 6
+y 9
 end
-arch woodfloor
-x 4
-y 7
+arch dungeon_magic
+x 6
+y 10
 end
-arch wwall_2_1_2
-x 4
-y 7
+arch grass_only
+x 6
+y 10
+move_block all
 end
-arch blocked
-x 4
-y 8
+arch grass_only
+x 6
+y 11
 end
-arch blocked
-x 5
+arch grass_only
+x 7
 end
-arch woodfloor
-x 5
-y 1
-end
-arch wwall_2_2_3
-x 5
+arch grass_only
+x 7
 y 1
 end
 arch woodfloor
-x 5
+x 7
 y 2
 end
-arch wwall_2_1_1
-x 5
+arch white_wall_2_1_2
+x 7
 y 2
 end
 arch woodfloor
-x 5
-y 3
-end
-arch wwall_2_1_1
-x 5
+x 7
 y 3
 end
 arch woodfloor
-x 5
-y 4
-end
-arch wwall_2_1_1
-x 5
+x 7
 y 4
 end
 arch woodfloor
-x 5
-y 5
-end
-arch wwall_2_1_1
-x 5
+x 7
 y 5
 end
 arch woodfloor
-x 5
+x 7
 y 6
 end
-arch wwall_2_1_1
-x 5
+arch white_wall_1_3
+x 7
 y 6
 end
 arch woodfloor
-x 5
+x 7
 y 7
 end
-arch wwall_2_2_4
-x 5
-y 7
-end
-arch blocked
-x 5
+arch woodfloor
+x 7
 y 8
 end
-arch blocked
-x 6
+arch woodfloor
+x 7
+y 9
 end
-arch blocked
-x 6
+arch white_wall_1_4
+x 7
+y 9
+end
+arch dungeon_magic
+x 7
+y 10
+end
+arch grass_only
+x 7
+y 10
+move_block all
+end
+arch grass_only
+x 7
+y 11
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch blocked
-x 6
+arch woodfloor
+x 8
 y 2
 end
-arch blocked
-x 6
+arch white_wall_2_1_2
+x 8
+y 2
+end
+arch woodfloor
+x 8
 y 3
 end
-arch blocked
-x 6
+arch woodfloor
+x 8
 y 4
 end
-arch blocked
-x 6
+arch woodfloor
+x 8
 y 5
 end
-arch blocked
-x 6
+arch woodfloor
+x 8
 y 6
 end
-arch blocked
-x 6
+arch door_2
+x 8
+y 6
+end
+arch woodfloor
+x 8
 y 7
 end
-arch blocked
-x 6
+arch woodfloor
+x 8
 y 8
 end
+arch woodfloor
+x 8
+y 9
+end
+arch white_wall_2_1_2
+x 8
+y 9
+end
+arch grass_only
+x 8
+y 10
+end
+arch grass_only
+x 8
+y 11
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch white_wall_2_1_2
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch chest
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch white_wall_1_4
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch clock_cw
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch white_wall_2_1_2
+x 9
+y 9
+end
+arch grass_only
+x 9
+y 10
+end
+arch grass_only
+x 9
+y 11
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch white_wall_2_2_3
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch white_wall_2_1_1
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch white_wall_2_1_1
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch white_wall_2_1_1
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch white_wall_3_4
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch white_wall_2_1_1
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch white_wall_2_1_1
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch white_wall_2_2_4
+x 10
+y 9
+end
+arch grass_only
+x 10
+y 10
+end
+arch grass_only
+x 10
+y 11
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch grass_only
+x 11
+y 2
+end
+arch grass_only
+x 11
+y 3
+end
+arch grass_only
+x 11
+y 4
+end
+arch grass_only
+x 11
+y 5
+end
+arch grass_only
+x 11
+y 6
+end
+arch grass_only
+x 11
+y 7
+end
+arch grass_only
+x 11
+y 8
+end
+arch grass_only
+x 11
+y 9
+end
+arch grass_only
+x 11
+y 10
+end
+arch grass_only
+x 11
+y 11
+end
+arch cobblestones2
+x 12
+end
+arch cobblestones2
+x 12
+y 1
+end
+arch cobblestones2
+x 12
+y 2
+end
+arch cobblestones2
+x 12
+y 3
+end
+arch cobblestones2
+x 12
+y 4
+end
+arch cobblestones2
+x 12
+y 5
+end
+arch cobblestones2
+x 12
+y 6
+end
+arch cobblestones2
+x 12
+y 7
+end
+arch cobblestones2
+x 12
+y 8
+end
+arch cobblestones2
+x 12
+y 9
+end
+arch cobblestones2
+x 12
+y 10
+end
+arch cobblestones2
+x 12
+y 11
+end
diff --git a/world/world_122_116 b/world/world_122_116
index 7dd46636d..0c391a286 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2012-07-01 Nicolas Weeger
+Modified: 2012-07-10 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_115
@@ -3723,8 +3723,8 @@ end
 arch hovels
 name Ava's House
 slaying ../navar_city/houses/avashouse
-hp 4
-sp 6
+hp 6
+sp 8
 x 10
 y 42
 end