diff --git a/navar_city/houses/no4mainst b/navar_city/houses/no4mainst
index 387c237a4..9e07eb4b7 100644
--- a/navar_city/houses/no4mainst
+++ b/navar_city/houses/no4mainst
@@ -2,93 +2,115 @@ arch map
 name No. 4 Main St.
 difficulty 3
 region navar
-width 9
-height 8
-enter_x 6
-enter_y 2
+width 17
+height 14
+enter_x 12
+enter_y 10
 msg
 Created:  2012-05-17 Rick Tanner
-Modified: 2012-05-17 Rick Tanner
+Modified: 2012-08-04 Rick Tanner
 endmsg
 end
-arch blocked
+arch cobblestones2
 end
-arch blocked
+arch grass_only
 y 1
 end
-arch blocked
+arch grass_only
 y 2
 end
-arch blocked
+arch grass_only
 y 3
 end
-arch blocked
+arch grass_only
 y 4
 end
-arch blocked
+arch grass_only
 y 5
 end
-arch blocked
+arch grass_only
 y 6
 end
-arch blocked
+arch grass_only
 y 7
 end
-arch blocked
+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 cobblestones2
 x 1
 end
-arch woodfloor
+arch grass_only
 x 1
 y 1
 end
-arch wall_2_2_2
-x 1
-y 1
-end
-arch woodfloor
+arch grass_only
 x 1
 y 2
 end
-arch wall_2_1_1
-x 1
-y 2
-end
-arch woodfloor
+arch grass_only
 x 1
 y 3
 end
-arch wall_2_1_1
-x 1
-y 3
-end
-arch woodfloor
+arch grass_only
 x 1
 y 4
 end
-arch wall_2_2_1
-x 1
-y 4
-end
-arch blocked
+arch grass_only
 x 1
 y 5
 end
-arch blocked
+arch grass_only
 x 1
 y 6
 end
-arch blocked
+arch grass_only
 x 1
 y 7
 end
-arch blocked
+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 cobblestones2
 x 2
 end
-arch woodfloor
-x 2
-y 1
-end
-arch wall_2_1_2
+arch grass_only
 x 2
 y 1
 end
@@ -96,11 +118,15 @@ arch woodfloor
 x 2
 y 2
 end
+arch woodwall_2_2_2
+x 2
+y 2
+end
 arch woodfloor
 x 2
 y 3
 end
-arch chair
+arch woodwall_2_1_1
 x 2
 y 3
 end
@@ -108,324 +134,1111 @@ arch woodfloor
 x 2
 y 4
 end
-arch wall_2_1_2
+arch woodwall_2_1_1
 x 2
 y 4
 end
-arch blocked
+arch woodfloor
 x 2
 y 5
 end
-arch blocked
+arch woodwall_win1
+x 2
+y 5
+end
+arch woodfloor
 x 2
 y 6
 end
-arch blocked
+arch woodwall_2_1_1
+x 2
+y 6
+end
+arch woodfloor
 x 2
 y 7
 end
-arch blocked
+arch woodwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodwall_win1
+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 woodwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch woodwall_2_2_1
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch grass_only
+x 2
+y 13
+end
+arch cobblestones2
 x 3
 end
+arch grass_only
+x 3
+y 1
+end
 arch woodfloor
 x 3
+y 2
+end
+arch woodwall_win2
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
+arch table_3
+x 3
+y 3
+end
+arch woodfloor
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch woodfloor
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch barrel
+x 3
+y 10
+end
+arch woodfloor
+x 3
+y 11
+end
+arch woodwall_2_1_2
+x 3
+y 11
+end
+arch grass_only
+x 3
+y 12
+end
+arch grass_only
+x 3
+y 13
+end
+arch cobblestones2
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch wall_2_1_2
-x 3
+arch woodfloor
+x 4
+y 2
+end
+arch woodwall_2_1_2
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 3
+end
+arch woodfloor
+x 4
+y 4
+end
+arch woodfloor
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch woodfloor
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch woodwall_2_1_2
+x 4
+y 11
+end
+arch grass_only
+x 4
+y 12
+end
+arch grass_only
+x 4
+y 13
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
+arch woodfloor
+x 5
+y 2
+end
+arch woodwall_2_1_2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch woodwall_2_2_2
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch woodwall_2_1_1
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodwall_2_1_1
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodwall_1_2
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch woodwall_win2
+x 5
+y 11
+end
+arch grass_only
+x 5
+y 12
+end
+arch grass_only
+x 5
+y 13
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch woodwall_2_1_2
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch woodwall_2_1_2
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
 arch creator
 other_arch angry_floor
-x 3
-y 2
+x 6
+y 8
 connected 22
 end
 arch woodfloor
-x 3
-y 2
-end
-arch chair_1.1
-x 3
-y 2
+x 6
+y 8
 end
 arch dwarf
-x 3
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch woodfloor
+x 6
+y 11
+end
+arch woodwall_2_1_2
+x 6
+y 11
+end
+arch grass_only
+x 6
+y 12
+end
+arch grass_only
+x 6
+y 13
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch woodwall_2_1_2
+x 7
 y 2
 end
 arch woodfloor
-x 3
-y 3
-end
-arch table_4
-x 3
+x 7
 y 3
 end
 arch woodfloor
-x 3
-y 4
-end
-arch wall_2_2_3
-x 3
+x 7
 y 4
 end
 arch woodfloor
-x 3
+x 7
 y 5
 end
-arch wall_2_1_1
-x 3
+arch woodwall_2_1_2
+x 7
 y 5
 end
+arch creator
+other_arch angry_floor
+x 7
+y 6
+connected 22
+end
 arch woodfloor
-x 3
+x 7
 y 6
 end
-arch wall_2_2_1
-x 3
+arch chair_1.1
+x 7
 y 6
 end
-arch blocked
-x 3
+arch dwarf
+x 7
+y 6
+end
+arch woodfloor
+x 7
 y 7
 end
-arch blocked
-x 4
+arch table_4
+x 7
+y 7
 end
 arch woodfloor
-x 4
-y 1
+x 7
+y 8
 end
-arch wall_2_1_2
-x 4
+arch woodfloor
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch woodwall_2_1_2
+x 7
+y 11
+end
+arch grass_only
+x 7
+y 12
+end
+arch grass_only
+x 7
+y 13
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
 arch woodfloor
-x 4
+x 8
+y 2
+end
+arch woodwall_2_1_2
+x 8
 y 2
 end
 arch woodfloor
-x 4
+x 8
 y 3
 end
 arch woodfloor
-x 4
+x 8
+y 3
+end
+arch woodfloor
+x 8
 y 4
 end
 arch woodfloor
-x 4
+x 8
 y 5
 end
-arch pedestal
-x 4
+arch woodwall_2_1_2
+x 8
 y 5
+end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodwall_2_1_2
+x 8
+y 11
+end
+arch grass_only
+x 8
+y 12
+end
+arch grass_only
+x 8
+y 13
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch woodwall_2_1_2
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch woodwall_2_1_2
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch pedestal
+x 9
+y 6
 invisible 1
 connected 22
 end
 arch chest
-x 4
-y 5
+x 9
+y 6
 end
 arch woodfloor
-x 4
-y 6
-end
-arch wall_2_1_2
-x 4
-y 6
-end
-arch blocked
-x 4
+x 9
 y 7
 end
-arch blocked
-x 5
+arch woodfloor
+x 9
+y 8
 end
 arch woodfloor
-x 5
-y 1
+x 9
+y 9
 end
-arch wall_2_1_2
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 4
+arch barrel
+x 9
+y 9
 end
 arch creator
 other_arch angry_floor
-x 5
-y 5
+x 9
+y 10
 connected 22
 end
 arch woodfloor
-x 5
-y 5
+x 9
+y 10
 end
 arch dwarf
-x 5
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodwall_win2
+x 9
+y 11
+end
+arch grass_only
+x 9
+y 12
+end
+arch grass_only
+x 9
+y 13
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch woodwall_2_1_2
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch woodwall_2_2_3
+x 10
 y 5
 end
 arch woodfloor
-x 5
+x 10
 y 6
 end
-arch wall_2_1_2
-x 5
+arch woodwall_2_1_1
+x 10
 y 6
 end
-arch blocked
-x 5
+arch woodfloor
+x 10
 y 7
 end
-arch blocked
-x 6
+arch woodwall_2_1_1
+x 10
+y 7
 end
 arch woodfloor
-x 6
-y 1
+x 10
+y 8
 end
-arch wall_2_1_2
-x 6
+arch woodwall_2_1_1
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch woodwall_2_1_1
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch woodwall_2_1_1
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch woodwall_3_1
+x 10
+y 11
+end
+arch grass_only
+x 10
+y 12
+end
+arch grass_only
+x 10
+y 13
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch woodfloor
-x 6
+x 11
 y 2
 end
-arch oakdoor
+arch woodwall_2_1_2
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
+arch woodfloor
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch woodfloor
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
+arch woodwall_1_3
+x 11
+y 11
+end
+arch dungeon_magic
+x 11
+y 12
+end
+arch grass_only
+x 11
+y 12
+move_block all
+end
+arch grass_only
+x 11
+y 13
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch woodfloor
+x 12
+y 2
+end
+arch woodwall_2_1_2
+x 12
+y 2
+end
+arch woodfloor
+x 12
+y 3
+end
+arch woodfloor
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
+arch woodfloor
+x 12
+y 7
+end
+arch woodfloor
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 9
+end
+arch woodfloor
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch oakdoor_2
 slaying /world/world_121_116
 hp 45
 sp 47
-x 6
-y 2
+x 12
+y 11
 end
-arch woodfloor
-x 6
-y 3
+arch dungeon_magic
+x 12
+y 12
 end
-arch woodfloor
-x 6
-y 4
+arch grass_only
+x 12
+y 12
+move_block all
 end
-arch creator
-other_arch angry_floor
-x 6
-y 5
-connected 22
+arch grass_only
+x 12
+y 13
 end
-arch woodfloor
-x 6
-y 5
+arch cobblestones2
+x 13
 end
-arch dwarf
-x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch wall_2_1_2
-x 6
-y 6
-end
-arch blocked
-x 6
-y 7
-end
-arch blocked
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch wall_2_2_3
-x 7
+arch grass_only
+x 13
 y 1
 end
 arch woodfloor
-x 7
+x 13
 y 2
 end
-arch wall_2_1_1
-x 7
+arch woodwall_win2
+x 13
 y 2
 end
 arch woodfloor
-x 7
-y 3
-end
-arch wall_2_1_1
-x 7
+x 13
 y 3
 end
 arch woodfloor
-x 7
+x 13
 y 4
 end
-arch wall_2_1_1
-x 7
+arch barrel
+x 13
 y 4
 end
 arch woodfloor
-x 7
-y 5
-end
-arch wall_2_1_1
-x 7
+x 13
 y 5
 end
 arch woodfloor
-x 7
+x 13
 y 6
 end
-arch wall_2_2_4
-x 7
-y 6
-end
-arch blocked
-x 7
+arch woodfloor
+x 13
 y 7
 end
-arch blocked
-x 8
+arch woodfloor
+x 13
+y 8
 end
-arch blocked
-x 8
+arch woodfloor
+x 13
+y 9
+end
+arch woodfloor
+x 13
+y 10
+end
+arch woodfloor
+x 13
+y 11
+end
+arch woodwall_1_4
+x 13
+y 11
+end
+arch dungeon_magic
+x 13
+y 12
+end
+arch grass_only
+x 13
+y 12
+move_block all
+end
+arch grass_only
+x 13
+y 13
+end
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch blocked
-x 8
+arch woodfloor
+x 14
 y 2
 end
-arch blocked
-x 8
+arch woodwall_2_2_3
+x 14
+y 2
+end
+arch woodfloor
+x 14
 y 3
 end
-arch blocked
-x 8
+arch woodwall_2_1_1
+x 14
+y 3
+end
+arch woodfloor
+x 14
 y 4
 end
-arch blocked
-x 8
+arch woodwall_2_1_1
+x 14
+y 4
+end
+arch woodfloor
+x 14
 y 5
 end
-arch blocked
-x 8
+arch woodwall_win1
+x 14
+y 5
+end
+arch woodfloor
+x 14
 y 6
 end
-arch blocked
-x 8
+arch woodwall_2_1_1
+x 14
+y 6
+end
+arch woodfloor
+x 14
 y 7
 end
+arch woodwall_2_1_1
+x 14
+y 7
+end
+arch woodfloor
+x 14
+y 8
+end
+arch woodwall_win1
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
+arch woodwall_2_1_1
+x 14
+y 9
+end
+arch woodfloor
+x 14
+y 10
+end
+arch woodwall_2_1_1
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch woodwall_2_2_4
+x 14
+y 11
+end
+arch grass_only
+x 14
+y 12
+end
+arch grass_only
+x 14
+y 13
+end
+arch cobblestones2
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
+y 2
+end
+arch grass_only
+x 15
+y 3
+end
+arch grass_only
+x 15
+y 4
+end
+arch grass_only
+x 15
+y 5
+end
+arch grass_only
+x 15
+y 6
+end
+arch grass_only
+x 15
+y 7
+end
+arch grass_only
+x 15
+y 8
+end
+arch grass_only
+x 15
+y 9
+end
+arch grass_only
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 12
+end
+arch grass_only
+x 15
+y 13
+end
+arch cobblestones2
+x 16
+end
+arch cobblestones2
+x 16
+y 1
+end
+arch cobblestones2
+x 16
+y 2
+end
+arch cobblestones2
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 7
+end
+arch cobblestones2
+x 16
+y 8
+end
+arch cobblestones2
+x 16
+y 9
+end
+arch cobblestones2
+x 16
+y 10
+end
+arch cobblestones2
+x 16
+y 11
+end
+arch cobblestones2
+x 16
+y 12
+end
+arch cobblestones2
+x 16
+y 13
+end
diff --git a/world/world_121_116 b/world/world_121_116
index 41e5dccfc..7c36d03d4 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2012-08-02 Rick Tanner
+Modified: 2012-08-04 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_115
@@ -13698,8 +13698,8 @@ end
 arch house_1
 name No. 4 Main St.
 slaying ../navar_city/houses/no4mainst
-hp 6
-sp 2
+hp 12
+sp 10
 x 45
 y 47
 end