diff --git a/navar_city/houses/freddyshouse b/navar_city/houses/freddyshouse
index 5928441e0..a7aea184e 100644
--- a/navar_city/houses/freddyshouse
+++ b/navar_city/houses/freddyshouse
@@ -2,110 +2,144 @@ arch map
 name Freddy's House
 difficulty 4
 region navar
-width 15
-height 11
+width 17
+height 17
 enter_x 12
-enter_y 5
+enter_y 13
 msg
 Created:  2012-05-17 Rick Tanner
-Modified: 2012-05-17 Rick Tanner
+Modified: 2012-07-23 leaf
 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 blocked
+arch cobblestones2
 y 10
 end
-arch blocked
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
 x 1
 end
-arch blocked
+arch grass_only
 x 1
 y 1
 end
-arch blocked
+arch grass_only
 x 1
 y 2
 end
-arch woodfloor
+arch grass_only
 x 1
 y 3
 end
-arch wall_2_2_2
-x 1
-y 3
-end
-arch woodfloor
+arch grass_only
 x 1
 y 4
 end
-arch wall_2_1_1
-x 1
-y 4
-end
-arch woodfloor
+arch grass_only
 x 1
 y 5
 end
-arch wall_2_2_1
-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 blocked
+arch grass_only
 x 1
 y 9
 end
-arch blocked
+arch grass_only
 x 1
 y 10
 end
-arch blocked
+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 cobblestones2
 x 2
 end
-arch blocked
+arch grass_only
 x 2
 y 1
 end
-arch blocked
+arch woodfloor
+x 2
+y 2
+end
+arch white_wall_2_2_2
 x 2
 y 2
 end
@@ -113,7 +147,7 @@ arch woodfloor
 x 2
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_1
 x 2
 y 3
 end
@@ -121,7 +155,7 @@ arch woodfloor
 x 2
 y 4
 end
-arch chest
+arch white_wall_2_1_1
 x 2
 y 4
 end
@@ -129,38 +163,102 @@ arch woodfloor
 x 2
 y 5
 end
-arch wall_2_1_2
+arch white_wall_2_1_1
 x 2
 y 5
 end
-arch blocked
+arch woodfloor
 x 2
 y 6
 end
-arch blocked
+arch white_wall_win1
+x 2
+y 6
+end
+arch woodfloor
 x 2
 y 7
 end
-arch blocked
+arch white_wall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
 x 2
 y 8
 end
-arch blocked
+arch white_wall_3_2
+x 2
+y 8
+end
+arch woodfloor
 x 2
 y 9
 end
-arch blocked
+arch white_wall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
 x 2
 y 10
 end
-arch blocked
+arch white_wall_win1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch white_wall_2_1_1
+x 2
+y 11
+end
+arch woodfloor
+x 2
+y 12
+end
+arch white_wall_2_1_1
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
+arch white_wall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch white_wall_2_2_1
+x 2
+y 14
+end
+arch grass_only
+x 2
+y 15
+end
+arch grass_only
+x 2
+y 16
+end
+arch cobblestones2
 x 3
 end
-arch blocked
+arch grass_only
 x 3
 y 1
 end
-arch blocked
+arch woodfloor
+x 3
+y 2
+end
+arch white_wall_2_1_2
 x 3
 y 2
 end
@@ -168,7 +266,7 @@ arch woodfloor
 x 3
 y 3
 end
-arch wall_2_1_2
+arch desk
 x 3
 y 3
 end
@@ -180,31 +278,19 @@ arch woodfloor
 x 3
 y 5
 end
-arch wall_2_2_3
-x 3
-y 5
-end
 arch woodfloor
 x 3
 y 6
 end
-arch wall_2_1_1
-x 3
-y 6
-end
 arch woodfloor
 x 3
 y 7
 end
-arch wall_2_1_1
-x 3
-y 7
-end
 arch woodfloor
 x 3
 y 8
 end
-arch wall_2_1_1
+arch white_wall_1_3
 x 3
 y 8
 end
@@ -212,22 +298,62 @@ arch woodfloor
 x 3
 y 9
 end
-arch wall_2_2_1
-x 3
-y 9
-end
-arch blocked
+arch woodfloor
 x 3
 y 10
 end
-arch blocked
+arch chair_1.1
+x 3
+y 10
+end
+arch woodfloor
+x 3
+y 11
+end
+arch table_1x2
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
+arch woodfloor
+x 3
+y 13
+end
+arch chair_1.3
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
+end
+arch white_wall_2_1_2
+x 3
+y 14
+end
+arch grass_only
+x 3
+y 15
+end
+arch grass_only
+x 3
+y 16
+end
+arch cobblestones2
 x 4
 end
-arch blocked
+arch grass_only
 x 4
 y 1
 end
-arch blocked
+arch woodfloor
+x 4
+y 2
+end
+arch white_wall_2_1_2
 x 4
 y 2
 end
@@ -235,10 +361,6 @@ arch woodfloor
 x 4
 y 3
 end
-arch wall_2_1_2
-x 4
-y 3
-end
 arch woodfloor
 x 4
 y 4
@@ -263,22 +385,58 @@ arch woodfloor
 x 4
 y 9
 end
-arch wall_2_1_2
-x 4
-y 9
-end
-arch blocked
+arch woodfloor
 x 4
 y 10
 end
-arch blocked
+arch woodfloor
+x 4
+y 11
+end
+arch chair_1.2
+x 4
+y 11
+end
+arch woodfloor
+x 4
+y 12
+end
+arch chair_1.2
+x 4
+y 12
+end
+arch woodfloor
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 14
+end
+arch white_wall_2_1_2
+x 4
+y 14
+end
+arch grass_only
+x 4
+y 15
+end
+arch grass_only
+x 4
+y 16
+end
+arch cobblestones2
 x 5
 end
-arch blocked
+arch grass_only
 x 5
 y 1
 end
-arch blocked
+arch woodfloor
+x 5
+y 2
+end
+arch white_wall_win2
 x 5
 y 2
 end
@@ -286,18 +444,10 @@ arch woodfloor
 x 5
 y 3
 end
-arch wall_2_1_2
-x 5
-y 3
-end
 arch woodfloor
 x 5
 y 4
 end
-arch chair
-x 5
-y 4
-end
 arch woodfloor
 x 5
 y 5
@@ -314,26 +464,58 @@ arch woodfloor
 x 5
 y 8
 end
+arch white_wall_1_4
+x 5
+y 8
+end
 arch woodfloor
 x 5
 y 9
 end
-arch wall_2_1_2
-x 5
-y 9
-end
-arch blocked
+arch woodfloor
 x 5
 y 10
 end
-arch blocked
+arch woodfloor
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch woodfloor
+x 5
+y 14
+end
+arch white_wall_win2
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 15
+end
+arch grass_only
+x 5
+y 16
+end
+arch cobblestones2
 x 6
 end
-arch blocked
+arch grass_only
 x 6
 y 1
 end
-arch blocked
+arch woodfloor
+x 6
+y 2
+end
+arch white_wall_2_1_2
 x 6
 y 2
 end
@@ -341,7 +523,7 @@ arch woodfloor
 x 6
 y 3
 end
-arch wall_2_1_2
+arch bookshelf
 x 6
 y 3
 end
@@ -349,50 +531,74 @@ arch woodfloor
 x 6
 y 4
 end
-arch table_4
-x 6
-y 4
-end
 arch woodfloor
 x 6
 y 5
 end
+arch woodfloor
+x 6
+y 6
+end
 arch chair_1.1
 x 6
-y 5
-end
-arch woodfloor
-x 6
 y 6
 end
 arch woodfloor
 x 6
 y 7
 end
+arch table_3
+x 6
+y 7
+end
 arch woodfloor
 x 6
 y 8
 end
+arch white_wall_2_1_2
+x 6
+y 8
+end
 arch woodfloor
 x 6
 y 9
 end
-arch wall_2_1_2
-x 6
-y 9
-end
-arch blocked
+arch woodfloor
 x 6
 y 10
 end
-arch blocked
-x 7
+arch woodfloor
+x 6
+y 11
 end
 arch woodfloor
-x 7
-y 1
+x 6
+y 12
 end
-arch wall_2_2_2
+arch woodfloor
+x 6
+y 13
+end
+arch woodfloor
+x 6
+y 14
+end
+arch white_wall_2_1_2
+x 6
+y 14
+end
+arch grass_only
+x 6
+y 15
+end
+arch grass_only
+x 6
+y 16
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
 x 7
 y 1
 end
@@ -400,7 +606,7 @@ arch woodfloor
 x 7
 y 2
 end
-arch wall_2_1_1
+arch white_wall_3_3
 x 7
 y 2
 end
@@ -408,7 +614,7 @@ arch woodfloor
 x 7
 y 3
 end
-arch wall_3_4
+arch white_wall_1_2
 x 7
 y 3
 end
@@ -416,15 +622,11 @@ arch woodfloor
 x 7
 y 4
 end
-arch wall_2_1_1
-x 7
-y 4
-end
 arch woodfloor
 x 7
 y 5
 end
-arch wall_1_2
+arch white_wall_1_1
 x 7
 y 5
 end
@@ -432,139 +634,509 @@ arch woodfloor
 x 7
 y 6
 end
+arch white_wall_2_1_1
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch white_wall_2_1_1
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch white_wall_4
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch white_wall_2_1_1
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch white_wall_1_2
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch woodfloor
+x 7
+y 12
+end
+arch white_wall_1_1
+x 7
+y 12
+end
+arch woodfloor
+x 7
+y 13
+end
+arch white_wall_2_1_1
+x 7
+y 13
+end
+arch woodfloor
+x 7
+y 14
+end
+arch white_wall_3_1
+x 7
+y 14
+end
+arch grass_only
+x 7
+y 15
+end
+arch grass_only
+x 7
+y 16
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch woodfloor
+x 8
+y 2
+end
+arch white_wall_2_1_2
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch woodfloor
+x 8
+y 4
+end
+arch woodfloor
+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 white_wall_2_1_2
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch chair
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
+arch woodfloor
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch white_wall_2_1_2
+x 8
+y 14
+end
+arch grass_only
+x 8
+y 15
+end
+arch grass_only
+x 8
+y 16
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch white_wall_win2
+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 woodfloor
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch white_wall_2_1_2
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch white_wall_win2
+x 9
+y 14
+end
+arch grass_only
+x 9
+y 15
+end
+arch grass_only
+x 9
+y 16
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch white_wall_3_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_2_1
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch white_wall_2_1_2
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch chair_1.1
+x 10
+y 11
+end
+arch woodfloor
+x 10
+y 12
+end
+arch woodfloor
+x 10
+y 13
+end
+arch woodfloor
+x 10
+y 14
+end
+arch white_wall_2_1_2
+x 10
+y 14
+end
+arch grass_only
+x 10
+y 15
+end
+arch grass_only
+x 10
+y 16
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch woodfloor
+x 11
+y 2
+end
+arch white_wall_2_1_2
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch bed_1
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
+arch white_wall_1_3
+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 white_wall_2_1_2
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch chair
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
+arch table_4
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
+arch woodfloor
+x 11
+y 14
+end
+arch white_wall_1_3
+x 11
+y 14
+end
+arch dungeon_magic
+x 11
+y 15
+end
+arch grass_only
+x 11
+y 15
+move_block all
+end
+arch grass_only
+x 11
+y 16
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch woodfloor
+x 12
+y 2
+end
+arch white_wall_win2
+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 pedestal
-x 7
-y 6
+x 12
+y 5
 invisible 1
 connected 33
 end
-arch door_look_2
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch wall_1_1
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch wall_2_1_1
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
-arch wall_3_1
-x 7
-y 9
-end
-arch blocked
-x 7
-y 10
-end
-arch blocked
-x 8
-end
-arch woodfloor
-x 8
-y 1
-end
-arch wall_2_1_2
-x 8
-y 1
-end
-arch woodfloor
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch woodfloor
-x 8
-y 4
-end
-arch chair
-x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch table_4
-x 8
+arch door_2
+x 12
 y 5
 end
 arch woodfloor
-x 8
+x 12
 y 6
 end
 arch woodfloor
-x 8
+x 12
 y 7
 end
 arch woodfloor
-x 8
+x 12
+y 8
+end
+arch white_wall_2_1_2
+x 12
 y 8
 end
 arch woodfloor
-x 8
+x 12
 y 9
 end
-arch wall_2_1_2
-x 8
-y 9
-end
-arch blocked
-x 8
+arch woodfloor
+x 12
 y 10
 end
-arch blocked
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch wall_2_1_2
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch woodfloor
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
 arch creator
 other_arch angry_floor
-x 9
-y 5
+x 12
+y 11
 connected 33
 end
 arch woodfloor
-x 9
-y 5
+x 12
+y 11
 end
 arch chair_1.1
-x 9
-y 5
+x 12
+y 11
 end
 arch small_troll
 name Freddy the Troll
@@ -572,230 +1144,62 @@ msg
 @match *
 Go away from me house.  Me no like you.  Leave now Scummer!
 endmsg
-x 9
-y 5
+x 12
+y 11
 unaggressive 1
 end
 arch woodfloor
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch wall_2_1_2
-x 9
-y 9
-end
-arch blocked
-x 9
-y 10
-end
-arch blocked
-x 10
-end
-arch woodfloor
-x 10
-y 1
-end
-arch wall_2_2_3
-x 10
-y 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch wall_2_2_1
-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 woodfloor
-x 10
-y 6
-end
-arch woodfloor
-x 10
-y 7
-end
-arch woodfloor
-x 10
-y 8
-end
-arch woodfloor
-x 10
-y 9
-end
-arch wall_2_1_2
-x 10
-y 9
-end
-arch blocked
-x 10
-y 10
-end
-arch blocked
-x 11
-end
-arch blocked
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 2
-end
-arch wall_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 wall_2_2_2
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch wall_2_2_4
-x 11
-y 9
-end
-arch blocked
-x 11
-y 10
-end
-arch blocked
 x 12
-end
-arch blocked
-x 12
-y 1
+y 12
 end
 arch woodfloor
 x 12
-y 2
-end
-arch wall_2_2_3
-x 12
-y 2
+y 13
 end
 arch woodfloor
 x 12
-y 3
+y 14
 end
-arch wall_2_1_1
-x 12
-y 3
-end
-arch woodfloor
-x 12
-y 4
-end
-arch wall_2_2_1
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch oakdoor
+arch oakdoor_2
 slaying /world/world_121_117
 hp 45
 sp 0
 x 12
-y 5
+y 14
 end
-arch woodfloor
+arch dungeon_magic
 x 12
-y 6
+y 15
 end
-arch wall_2_2_2
+arch grass_only
 x 12
-y 6
+y 15
+move_block all
 end
-arch woodfloor
+arch grass_only
 x 12
-y 7
+y 16
 end
-arch wall_2_1_1
-x 12
-y 7
-end
-arch woodfloor
-x 12
-y 8
-end
-arch wall_2_2_4
-x 12
-y 8
-end
-arch blocked
-x 12
-y 9
-end
-arch blocked
-x 12
-y 10
-end
-arch blocked
+arch cobblestones2
 x 13
 end
-arch blocked
+arch grass_only
 x 13
 y 1
 end
-arch blocked
+arch woodfloor
 x 13
 y 2
 end
-arch blocked
+arch white_wall_2_1_2
+x 13
+y 2
+end
+arch woodfloor
+x 13
+y 3
+end
+arch chest
 x 13
 y 3
 end
@@ -803,15 +1207,11 @@ arch woodfloor
 x 13
 y 4
 end
-arch wall_2_2_3
-x 13
-y 4
-end
 arch woodfloor
 x 13
 y 5
 end
-arch wall_2_1_1
+arch white_wall_1_4
 x 13
 y 5
 end
@@ -819,66 +1219,309 @@ arch woodfloor
 x 13
 y 6
 end
-arch wall_2_2_4
-x 13
-y 6
-end
-arch blocked
+arch woodfloor
 x 13
 y 7
 end
-arch blocked
+arch woodfloor
 x 13
 y 8
 end
-arch blocked
+arch white_wall_2_1_2
+x 13
+y 8
+end
+arch woodfloor
 x 13
 y 9
 end
-arch blocked
+arch woodfloor
 x 13
 y 10
 end
-arch blocked
+arch woodfloor
+x 13
+y 11
+end
+arch woodfloor
+x 13
+y 12
+end
+arch woodfloor
+x 13
+y 13
+end
+arch woodfloor
+x 13
+y 14
+end
+arch white_wall_1_4
+x 13
+y 14
+end
+arch dungeon_magic
+x 13
+y 15
+end
+arch grass_only
+x 13
+y 15
+move_block all
+end
+arch grass_only
+x 13
+y 16
+end
+arch cobblestones2
 x 14
 end
-arch blocked
+arch grass_only
 x 14
 y 1
 end
-arch blocked
+arch woodfloor
 x 14
 y 2
 end
-arch blocked
+arch white_wall_2_2_3
+x 14
+y 2
+end
+arch woodfloor
 x 14
 y 3
 end
-arch blocked
+arch white_wall_2_1_1
+x 14
+y 3
+end
+arch woodfloor
 x 14
 y 4
 end
-arch blocked
+arch white_wall_2_1_1
+x 14
+y 4
+end
+arch woodfloor
 x 14
 y 5
 end
-arch blocked
+arch white_wall_3_4
+x 14
+y 5
+end
+arch woodfloor
 x 14
 y 6
 end
-arch blocked
+arch white_wall_win1
+x 14
+y 6
+end
+arch woodfloor
 x 14
 y 7
 end
-arch blocked
+arch white_wall_2_1_1
+x 14
+y 7
+end
+arch woodfloor
 x 14
 y 8
 end
-arch blocked
+arch white_wall_3_4
+x 14
+y 8
+end
+arch woodfloor
 x 14
 y 9
 end
-arch blocked
+arch white_wall_2_1_1
+x 14
+y 9
+end
+arch woodfloor
 x 14
 y 10
 end
+arch white_wall_win1
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch white_wall_2_1_1
+x 14
+y 11
+end
+arch woodfloor
+x 14
+y 12
+end
+arch white_wall_2_1_1
+x 14
+y 12
+end
+arch woodfloor
+x 14
+y 13
+end
+arch white_wall_2_1_1
+x 14
+y 13
+end
+arch woodfloor
+x 14
+y 14
+end
+arch white_wall_2_2_4
+x 14
+y 14
+end
+arch grass_only
+x 14
+y 15
+end
+arch grass_only
+x 14
+y 16
+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 grass_only
+x 15
+y 14
+end
+arch grass_only
+x 15
+y 15
+end
+arch grass_only
+x 15
+y 16
+end
+arch cobblestones2
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch grass_only
+x 16
+y 2
+end
+arch grass_only
+x 16
+y 3
+end
+arch grass_only
+x 16
+y 4
+end
+arch grass_only
+x 16
+y 5
+end
+arch grass_only
+x 16
+y 6
+end
+arch grass_only
+x 16
+y 7
+end
+arch grass_only
+x 16
+y 8
+end
+arch grass_only
+x 16
+y 9
+end
+arch grass_only
+x 16
+y 10
+end
+arch grass_only
+x 16
+y 11
+end
+arch grass_only
+x 16
+y 12
+end
+arch grass_only
+x 16
+y 13
+end
+arch grass_only
+x 16
+y 14
+end
+arch grass_only
+x 16
+y 15
+end
+arch grass_only
+x 16
+y 16
+end
diff --git a/world/world_121_117 b/world/world_121_117
index c30dcfce0..e20fca079 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-07-20 Rick Tanner
+Modified: 2012-07-23 leaf
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -12826,7 +12826,7 @@ arch house_small
 name Freddy's House
 slaying ../navar_city/houses/freddyshouse
 hp 12
-sp 5
+sp 13
 x 45
 end
 arch dungeon_magic