diff --git a/navar_city/warehouse4 b/navar_city/warehouse4
index 38a41a5f6..b8be49505 100644
--- a/navar_city/warehouse4
+++ b/navar_city/warehouse4
@@ -2,135 +2,235 @@ arch map
 name Warehouse #4
 difficulty 3
 region navar
-width 30
-height 16
+width 32
+height 18
 enter_x 27
 enter_y 15
 msg
 Created:  1993-11-12
-Modified: 2012-05-12 Nicolas Weeger
+Modified: 2014-06-16 jwright
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+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
+y 17
+end
+arch cobblestones2
+x 1
 end
 arch woodfloor
+x 1
+y 1
 end
 arch wall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch wall_2_1_1
+x 1
 y 1
 end
 arch woodfloor
+x 1
 y 2
 end
 arch wall_2_1_1
+x 1
 y 2
 end
 arch woodfloor
+x 1
 y 3
 end
 arch wall_2_1_1
+x 1
 y 3
 end
 arch woodfloor
+x 1
 y 4
 end
 arch wall_2_1_1
+x 1
 y 4
 end
 arch woodfloor
+x 1
 y 5
 end
 arch wall_2_1_1
+x 1
 y 5
 end
 arch woodfloor
+x 1
 y 6
 end
 arch wall_2_1_1
+x 1
 y 6
 end
 arch woodfloor
+x 1
 y 7
 end
 arch wall_2_1_1
+x 1
 y 7
 end
 arch woodfloor
+x 1
 y 8
 end
 arch wall_2_1_1
+x 1
 y 8
 end
 arch woodfloor
+x 1
 y 9
 end
 arch wall_2_1_1
+x 1
 y 9
 end
 arch woodfloor
+x 1
 y 10
 end
 arch wall_2_1_1
+x 1
 y 10
 end
 arch woodfloor
+x 1
 y 11
 end
 arch wall_2_1_1
+x 1
 y 11
 end
 arch woodfloor
+x 1
 y 12
 end
 arch wall_2_1_1
+x 1
 y 12
 end
 arch woodfloor
+x 1
 y 13
 end
 arch wall_2_1_1
+x 1
 y 13
 end
 arch woodfloor
+x 1
 y 14
 end
 arch wall_2_1_1
+x 1
 y 14
 end
 arch woodfloor
+x 1
 y 15
 end
+arch wall_2_1_1
+x 1
+y 15
+end
+arch woodfloor
+x 1
+y 16
+end
 arch wall_2_2_1
-y 15
+x 1
+y 16
+end
+arch cobblestones2
+x 1
+y 17
+end
+arch cobblestones2
+x 2
 end
 arch woodfloor
-x 1
+x 2
+y 1
 end
 arch wall_2_1_2
-x 1
+x 2
+y 1
 end
 arch woodfloor
-x 1
-y 1
+x 2
+y 2
 end
 arch random_food
-x 1
-y 1
-end
-arch woodfloor
-x 1
+x 2
 y 2
 end
 arch woodfloor
-x 1
+x 2
 y 3
 end
 arch woodfloor
-x 1
+x 2
 y 4
 end
+arch woodfloor
+x 2
+y 5
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -139,60 +239,60 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 1
-y 4
+x 2
+y 5
 level 6
 end
 arch woodfloor
-x 1
-y 5
-end
-arch woodfloor
-x 1
+x 2
 y 6
 end
 arch woodfloor
-x 1
+x 2
 y 7
 end
 arch woodfloor
-x 1
+x 2
 y 8
 end
 arch woodfloor
-x 1
+x 2
 y 9
 end
 arch woodfloor
-x 1
+x 2
 y 10
 end
 arch woodfloor
-x 1
+x 2
 y 11
 end
+arch woodfloor
+x 2
+y 12
+end
 arch locked_door1
 slaying navar_ware
 msg
 For some reason this door is locked.
 endmsg
 face ldoor_brown1.111
-x 1
-y 11
+x 2
+y 12
 blocksview 1
 end
 arch woodfloor
-x 1
-y 12
-end
-arch woodfloor
-x 1
+x 2
 y 13
 end
 arch woodfloor
-x 1
+x 2
 y 14
 end
+arch woodfloor
+x 2
+y 15
+end
 arch man
 msg
 @match smugglers
@@ -202,8 +302,8 @@ Yes, the entrance, it is in the lower levels of the Lighthouse, but you have to
 @match *
 Praise Valriel you have come to let me out... those damned smugglers.
 endmsg
-x 1
-y 14
+x 2
+y 15
 stand_still 1
 arch NPCGift
 arch blue_key
@@ -216,51 +316,60 @@ name /navar_city/warehouse4.msg
 end
 end
 arch woodfloor
-x 1
-y 15
-end
-arch wall_2_1_2
-x 1
-y 15
-end
-arch woodfloor
 x 2
+y 16
 end
 arch wall_2_1_2
 x 2
+y 16
+end
+arch cobblestones2
+x 2
+y 17
+end
+arch cobblestones2
+x 3
 end
 arch woodfloor
-x 2
+x 3
+y 1
+end
+arch wall_2_1_2
+x 3
 y 1
 end
 arch woodfloor
-x 2
+x 3
 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 woodfloor
-x 2
+x 3
 y 7
 end
 arch woodfloor
-x 2
+x 3
 y 8
 end
+arch woodfloor
+x 3
+y 9
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -269,64 +378,73 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 2
-y 8
+x 3
+y 9
 level 6
 end
 arch woodfloor
-x 2
-y 9
-end
-arch woodfloor
-x 2
+x 3
 y 10
 end
 arch woodfloor
-x 2
+x 3
 y 11
 end
+arch woodfloor
+x 3
+y 12
+end
 arch wall_1_1
-x 2
-y 11
+x 3
+y 12
 end
 arch woodfloor
-x 2
-y 12
+x 3
+y 13
 end
 arch wall_2_2_1
-x 2
-y 12
-end
-arch woodfloor
-x 2
+x 3
 y 13
 end
 arch woodfloor
-x 2
+x 3
 y 14
 end
 arch woodfloor
-x 2
-y 15
-end
-arch wall_2_1_2
-x 2
+x 3
 y 15
 end
 arch woodfloor
 x 3
+y 16
 end
 arch wall_2_1_2
 x 3
+y 16
+end
+arch cobblestones2
+x 3
+y 17
+end
+arch cobblestones2
+x 4
 end
 arch woodfloor
-x 3
+x 4
+y 1
+end
+arch wall_2_1_2
+x 4
 y 1
 end
 arch woodfloor
-x 3
+x 4
 y 2
 end
+arch woodfloor
+x 4
+y 3
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -335,30 +453,30 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 3
-y 2
+x 4
+y 3
 level 6
 end
 arch woodfloor
-x 3
-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 woodfloor
-x 3
+x 4
 y 7
 end
+arch woodfloor
+x 4
+y 8
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -367,175 +485,193 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 3
-y 7
+x 4
+y 8
 level 6
 end
 arch woodfloor
-x 3
-y 8
-end
-arch woodfloor
-x 3
+x 4
 y 9
 end
 arch woodfloor
-x 3
+x 4
 y 10
 end
 arch woodfloor
-x 3
+x 4
 y 11
 end
 arch woodfloor
-x 3
+x 4
 y 12
 end
+arch woodfloor
+x 4
+y 13
+end
 arch wall_2_2_3
-x 3
-y 12
-end
-arch woodfloor
-x 3
-y 13
-end
-arch wall_2_1_1
-x 3
+x 4
 y 13
 end
 arch woodfloor
-x 3
+x 4
 y 14
 end
 arch wall_2_1_1
-x 3
+x 4
 y 14
 end
 arch woodfloor
-x 3
+x 4
 y 15
 end
+arch wall_2_1_1
+x 4
+y 15
+end
+arch woodfloor
+x 4
+y 16
+end
 arch wall_3_1
-x 3
-y 15
+x 4
+y 16
+end
+arch cobblestones2
+x 4
+y 17
+end
+arch cobblestones2
+x 5
 end
 arch woodfloor
-x 4
+x 5
+y 1
 end
 arch wall_2_1_2
-x 4
-end
-arch woodfloor
-x 4
+x 5
 y 1
 end
 arch woodfloor
-x 4
+x 5
 y 2
 end
 arch woodfloor
-x 4
+x 5
 y 3
 end
 arch woodfloor
-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 woodfloor
-x 4
+x 5
 y 7
 end
 arch woodfloor
-x 4
+x 5
 y 8
 end
 arch woodfloor
-x 4
+x 5
 y 9
 end
 arch woodfloor
-x 4
+x 5
 y 10
 end
 arch woodfloor
-x 4
+x 5
 y 11
 end
 arch woodfloor
-x 4
+x 5
 y 12
 end
 arch woodfloor
-x 4
+x 5
 y 13
 end
 arch woodfloor
-x 4
+x 5
 y 14
 end
 arch woodfloor
-x 4
-y 15
-end
-arch wall_2_1_2
-x 4
+x 5
 y 15
 end
 arch woodfloor
 x 5
+y 16
 end
 arch wall_2_1_2
 x 5
+y 16
+end
+arch cobblestones2
+x 5
+y 17
+end
+arch cobblestones2
+x 6
 end
 arch woodfloor
-x 5
+x 6
+y 1
+end
+arch wall_2_1_2
+x 6
 y 1
 end
 arch woodfloor
-x 5
+x 6
 y 2
 end
 arch woodfloor
-x 5
+x 6
 y 3
 end
 arch woodfloor
-x 5
+x 6
 y 4
 end
+arch woodfloor
+x 6
+y 5
+end
 arch wall_1_4
-x 5
-y 4
+x 6
+y 5
 end
 arch woodfloor
-x 5
-y 5
+x 6
+y 6
 end
 arch rock
 name crate
-x 5
-y 5
-end
-arch woodfloor
-x 5
+x 6
 y 6
 end
 arch woodfloor
-x 5
+x 6
 y 7
 end
 arch woodfloor
-x 5
+x 6
 y 8
 end
+arch woodfloor
+x 6
+y 9
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -544,76 +680,85 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 5
-y 8
+x 6
+y 9
 level 6
 end
 arch woodfloor
-x 5
-y 9
-end
-arch rock
-name crate
-x 5
-y 9
-end
-arch woodfloor
-x 5
+x 6
 y 10
 end
 arch rock
 name crate
-x 5
+x 6
 y 10
 end
 arch woodfloor
-x 5
+x 6
 y 11
 end
 arch rock
 name crate
-x 5
+x 6
 y 11
 end
 arch woodfloor
-x 5
+x 6
 y 12
 end
 arch rock
 name crate
-x 5
+x 6
 y 12
 end
 arch woodfloor
-x 5
+x 6
+y 13
+end
+arch rock
+name crate
+x 6
 y 13
 end
 arch woodfloor
-x 5
+x 6
 y 14
 end
 arch woodfloor
-x 5
-y 15
-end
-arch wall_2_1_2
-x 5
+x 6
 y 15
 end
 arch woodfloor
 x 6
+y 16
 end
 arch wall_2_1_2
 x 6
+y 16
+end
+arch cobblestones2
+x 6
+y 17
+end
+arch cobblestones2
+x 7
 end
 arch woodfloor
-x 6
+x 7
+y 1
+end
+arch wall_2_1_2
+x 7
 y 1
 end
 arch woodfloor
-x 6
+x 7
 y 2
 end
+arch woodfloor
+x 7
+y 3
+end
 arch mouse
 name Huge Rat
 hp 100
@@ -622,239 +767,123 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 6
-y 2
+x 7
+y 3
 level 6
 end
 arch woodfloor
-x 6
-y 3
+x 7
+y 4
 end
 arch woodfloor
-x 6
-y 4
+x 7
+y 5
 end
 arch wall_2_1_2
-x 6
-y 4
+x 7
+y 5
 end
 arch woodfloor
-x 6
-y 5
+x 7
+y 6
 end
 arch rock
 name crate
-x 6
-y 5
-end
-arch woodfloor
-x 6
+x 7
 y 6
 end
 arch woodfloor
-x 6
+x 7
 y 7
 end
 arch woodfloor
-x 6
+x 7
 y 8
 end
 arch woodfloor
-x 6
-y 9
-end
-arch rock
-name crate
-x 6
+x 7
 y 9
 end
 arch woodfloor
-x 6
+x 7
 y 10
 end
 arch rock
 name crate
-x 6
+x 7
 y 10
 end
 arch woodfloor
-x 6
+x 7
 y 11
 end
 arch rock
 name crate
-x 6
+x 7
 y 11
 end
 arch woodfloor
-x 6
+x 7
 y 12
 end
 arch rock
 name crate
-x 6
+x 7
 y 12
 end
 arch woodfloor
-x 6
+x 7
 y 13
 end
 arch rock
 name crate
-x 6
+x 7
 y 13
 end
 arch woodfloor
-x 6
+x 7
 y 14
 end
+arch rock
+name crate
+x 7
+y 14
+end
+arch woodfloor
+x 7
+y 15
+end
 arch random_wealth
-x 6
-y 14
-end
-arch woodfloor
-x 6
-y 15
-end
-arch wall_2_1_2
-x 6
-y 15
-end
-arch woodfloor
-x 7
-end
-arch wall_2_1_2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch woodfloor
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch wall_2_1_2
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
-end
-arch rock
-name crate
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
-arch rock
-name crate
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 10
-end
-arch rock
-name crate
-x 7
-y 10
-end
-arch woodfloor
-x 7
-y 11
-end
-arch rock
-name crate
-x 7
-y 11
-end
-arch woodfloor
-x 7
-y 12
-end
-arch rock
-name crate
-x 7
-y 12
-end
-arch woodfloor
-x 7
-y 13
-end
-arch rock
-name crate
-x 7
-y 13
-end
-arch woodfloor
-x 7
-y 14
-end
-arch rock
-name crate
-x 7
-y 14
-end
-arch woodfloor
-x 7
-y 15
-end
-arch wall_2_1_2
 x 7
 y 15
 end
 arch woodfloor
-x 8
+x 7
+y 16
 end
 arch wall_2_1_2
+x 7
+y 16
+end
+arch cobblestones2
+x 7
+y 17
+end
+arch cobblestones2
 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 mouse
-name Huge Rat
-hp 100
-maxhp 100
-exp 50
-dam 10
-wc 12
-ac 3
-x 8
-y 2
-level 6
-end
 arch woodfloor
 x 8
 y 3
@@ -863,24 +892,20 @@ arch woodfloor
 x 8
 y 4
 end
+arch woodfloor
+x 8
+y 5
+end
 arch wall_2_1_2
 x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch rock
-name crate
-x 8
 y 5
 end
 arch woodfloor
 x 8
 y 6
 end
-arch random_food
+arch rock
+name crate
 x 8
 y 6
 end
@@ -888,27 +913,14 @@ arch woodfloor
 x 8
 y 7
 end
-arch random_food
-x 8
-y 7
-end
 arch woodfloor
 x 8
 y 8
 end
-arch random_food
-x 8
-y 8
-end
 arch woodfloor
 x 8
 y 9
 end
-arch rock
-name crate
-x 8
-y 9
-end
 arch woodfloor
 x 8
 y 10
@@ -958,20 +970,34 @@ arch woodfloor
 x 8
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 8
 y 15
 end
 arch woodfloor
-x 9
+x 8
+y 16
 end
 arch wall_2_1_2
+x 8
+y 16
+end
+arch cobblestones2
+x 8
+y 17
+end
+arch cobblestones2
 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
@@ -980,129 +1006,6 @@ arch woodfloor
 x 9
 y 3
 end
-arch woodfloor
-x 9
-y 4
-end
-arch wall_2_1_2
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch rock
-name crate
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch rock
-name crate
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch random_food
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch rock
-name crate
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch rock
-name crate
-x 9
-y 9
-end
-arch woodfloor
-x 9
-y 10
-end
-arch rock
-name crate
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
-arch rock
-name crate
-x 9
-y 11
-end
-arch woodfloor
-x 9
-y 12
-end
-arch rock
-name crate
-x 9
-y 12
-end
-arch woodfloor
-x 9
-y 13
-end
-arch rock
-name crate
-x 9
-y 13
-end
-arch woodfloor
-x 9
-y 14
-end
-arch rock
-name crate
-x 9
-y 14
-end
-arch woodfloor
-x 9
-y 15
-end
-arch wall_2_1_2
-x 9
-y 15
-end
-arch woodfloor
-x 10
-end
-arch wall_2_1_2
-x 10
-end
-arch woodfloor
-x 10
-y 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch woodfloor
-x 10
-y 3
-end
 arch mouse
 name Huge Rat
 hp 100
@@ -1111,232 +1014,396 @@ exp 50
 dam 10
 wc 12
 ac 3
-x 10
+x 9
 y 3
 level 6
 end
 arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch wall_2_1_2
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch rock
+name crate
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch random_food
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch random_food
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch random_food
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch rock
+name crate
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch rock
+name crate
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch rock
+name crate
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch rock
+name crate
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch rock
+name crate
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
+arch rock
+name crate
+x 9
+y 15
+end
+arch woodfloor
+x 9
+y 16
+end
+arch wall_2_1_2
+x 9
+y 16
+end
+arch cobblestones2
+x 9
+y 17
+end
+arch cobblestones2
+x 10
+end
+arch woodfloor
+x 10
+y 1
+end
+arch wall_2_1_2
+x 10
+y 1
+end
+arch woodfloor
+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 wall_2_1_2
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch rock
+name crate
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch rock
+name crate
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch random_food
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch rock
+name crate
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch rock
+name crate
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch rock
+name crate
+x 10
+y 11
+end
+arch woodfloor
+x 10
+y 12
+end
+arch rock
+name crate
+x 10
+y 12
+end
+arch woodfloor
+x 10
+y 13
+end
+arch rock
+name crate
+x 10
+y 13
+end
+arch woodfloor
+x 10
+y 14
+end
+arch rock
+name crate
+x 10
+y 14
+end
+arch woodfloor
+x 10
+y 15
+end
+arch rock
+name crate
+x 10
+y 15
+end
+arch woodfloor
+x 10
+y 16
+end
+arch wall_2_1_2
+x 10
+y 16
+end
+arch cobblestones2
+x 10
+y 17
+end
+arch cobblestones2
+x 11
+end
+arch woodfloor
+x 11
+y 1
+end
+arch wall_2_1_2
+x 11
+y 1
+end
+arch woodfloor
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch mouse
+name Huge Rat
+hp 100
+maxhp 100
+exp 50
+dam 10
+wc 12
+ac 3
+x 11
+y 4
+level 6
+end
+arch woodfloor
+x 11
+y 5
+end
 arch wall_3_3
-x 10
-y 4
-end
-arch woodfloor
-x 10
-y 5
-end
-arch wall_2_1_1
-x 10
+x 11
 y 5
 end
 arch woodfloor
-x 10
+x 11
 y 6
 end
 arch wall_2_1_1
-x 10
+x 11
 y 6
 end
 arch woodfloor
-x 10
+x 11
 y 7
 end
 arch wall_2_1_1
-x 10
+x 11
 y 7
 end
 arch woodfloor
-x 10
+x 11
 y 8
 end
 arch wall_2_1_1
-x 10
+x 11
 y 8
 end
 arch woodfloor
-x 10
+x 11
 y 9
 end
 arch wall_2_1_1
-x 10
+x 11
 y 9
 end
 arch woodfloor
-x 10
+x 11
 y 10
 end
 arch wall_2_1_1
-x 10
+x 11
 y 10
 end
 arch woodfloor
-x 10
+x 11
 y 11
 end
 arch wall_2_1_1
-x 10
+x 11
 y 11
 end
 arch woodfloor
-x 10
+x 11
 y 12
 end
 arch wall_2_1_1
-x 10
+x 11
 y 12
 end
 arch woodfloor
-x 10
+x 11
 y 13
 end
 arch wall_2_1_1
-x 10
+x 11
 y 13
 end
 arch woodfloor
-x 10
+x 11
 y 14
 end
 arch wall_2_1_1
-x 10
+x 11
 y 14
 end
 arch woodfloor
-x 10
+x 11
 y 15
 end
+arch wall_2_1_1
+x 11
+y 15
+end
+arch woodfloor
+x 11
+y 16
+end
 arch wall_3_1
-x 10
-y 15
+x 11
+y 16
+end
+arch cobblestones2
+x 11
+y 17
+end
+arch cobblestones2
+x 12
 end
 arch woodfloor
-x 11
-end
-arch wall_2_1_2
-x 11
-end
-arch woodfloor
-x 11
+x 12
 y 1
 end
-arch woodfloor
-x 11
-y 2
-end
-arch woodfloor
-x 11
-y 3
-end
-arch woodfloor
-x 11
-y 4
-end
 arch wall_2_1_2
-x 11
-y 4
-end
-arch woodfloor
-x 11
-y 5
-end
-arch rock
-name crate
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch rock
-name crate
-x 11
-y 6
-end
-arch woodfloor
-x 11
-y 7
-end
-arch rock
-name crate
-x 11
-y 7
-end
-arch woodfloor
-x 11
-y 8
-end
-arch rock
-name crate
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch rock
-name crate
-x 11
-y 9
-end
-arch woodfloor
-x 11
-y 10
-end
-arch rock
-name crate
-x 11
-y 10
-end
-arch woodfloor
-x 11
-y 11
-end
-arch woodfloor
-x 11
-y 12
-end
-arch rock
-name crate
-x 11
-y 12
-end
-arch woodfloor
-x 11
-y 13
-end
-arch rock
-name crate
-x 11
-y 13
-end
-arch woodfloor
-x 11
-y 14
-end
-arch rock
-name crate
-x 11
-y 14
-end
-arch woodfloor
-x 11
-y 15
-end
-arch wall_2_1_2
-x 11
-y 15
-end
-arch woodfloor
-x 12
-end
-arch wall_2_1_2
-x 12
-end
-arch woodfloor
 x 12
 y 1
 end
@@ -1352,16 +1419,11 @@ arch woodfloor
 x 12
 y 4
 end
-arch wall_2_1_2
-x 12
-y 4
-end
 arch woodfloor
 x 12
 y 5
 end
-arch rock
-name crate
+arch wall_2_1_2
 x 12
 y 5
 end
@@ -1423,11 +1485,6 @@ arch woodfloor
 x 12
 y 12
 end
-arch rock
-name crate
-x 12
-y 12
-end
 arch woodfloor
 x 12
 y 13
@@ -1450,20 +1507,34 @@ arch woodfloor
 x 12
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 12
 y 15
 end
 arch woodfloor
-x 13
+x 12
+y 16
 end
 arch wall_2_1_2
+x 12
+y 16
+end
+arch cobblestones2
+x 12
+y 17
+end
+arch cobblestones2
 x 13
 end
 arch woodfloor
 x 13
 y 1
 end
+arch wall_2_1_2
+x 13
+y 1
+end
 arch woodfloor
 x 13
 y 2
@@ -1476,16 +1547,11 @@ arch woodfloor
 x 13
 y 4
 end
-arch wall_2_1_2
-x 13
-y 4
-end
 arch woodfloor
 x 13
 y 5
 end
-arch rock
-name crate
+arch wall_2_1_2
 x 13
 y 5
 end
@@ -1574,20 +1640,34 @@ arch woodfloor
 x 13
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 13
 y 15
 end
 arch woodfloor
-x 14
+x 13
+y 16
 end
 arch wall_2_1_2
+x 13
+y 16
+end
+arch cobblestones2
+x 13
+y 17
+end
+arch cobblestones2
 x 14
 end
 arch woodfloor
 x 14
 y 1
 end
+arch wall_2_1_2
+x 14
+y 1
+end
 arch woodfloor
 x 14
 y 2
@@ -1600,16 +1680,11 @@ arch woodfloor
 x 14
 y 4
 end
-arch wall_2_1_2
-x 14
-y 4
-end
 arch woodfloor
 x 14
 y 5
 end
-arch rock
-name crate
+arch wall_2_1_2
 x 14
 y 5
 end
@@ -1698,20 +1773,34 @@ arch woodfloor
 x 14
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 14
 y 15
 end
 arch woodfloor
-x 15
+x 14
+y 16
 end
 arch wall_2_1_2
+x 14
+y 16
+end
+arch cobblestones2
+x 14
+y 17
+end
+arch cobblestones2
 x 15
 end
 arch woodfloor
 x 15
 y 1
 end
+arch wall_2_1_2
+x 15
+y 1
+end
 arch woodfloor
 x 15
 y 2
@@ -1724,185 +1813,257 @@ arch woodfloor
 x 15
 y 4
 end
+arch woodfloor
+x 15
+y 5
+end
+arch wall_2_1_2
+x 15
+y 5
+end
+arch woodfloor
+x 15
+y 6
+end
+arch rock
+name crate
+x 15
+y 6
+end
+arch woodfloor
+x 15
+y 7
+end
+arch rock
+name crate
+x 15
+y 7
+end
+arch woodfloor
+x 15
+y 8
+end
+arch rock
+name crate
+x 15
+y 8
+end
+arch woodfloor
+x 15
+y 9
+end
+arch rock
+name crate
+x 15
+y 9
+end
+arch woodfloor
+x 15
+y 10
+end
+arch rock
+name crate
+x 15
+y 10
+end
+arch woodfloor
+x 15
+y 11
+end
+arch rock
+name crate
+x 15
+y 11
+end
+arch woodfloor
+x 15
+y 12
+end
+arch rock
+name crate
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch rock
+name crate
+x 15
+y 13
+end
+arch woodfloor
+x 15
+y 14
+end
+arch rock
+name crate
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 15
+end
+arch rock
+name crate
+x 15
+y 15
+end
+arch woodfloor
+x 15
+y 16
+end
+arch wall_2_1_2
+x 15
+y 16
+end
+arch cobblestones2
+x 15
+y 17
+end
+arch cobblestones2
+x 16
+end
+arch woodfloor
+x 16
+y 1
+end
+arch wall_2_1_2
+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 wall_1_3
-x 15
-y 4
-end
-arch woodfloor
-x 15
-y 5
-end
-arch rock
-name crate
-x 15
+x 16
 y 5
 end
 arch woodfloor
-x 15
+x 16
 y 6
 end
 arch rock
 name crate
-x 15
+x 16
 y 6
 end
 arch woodfloor
-x 15
+x 16
 y 7
 end
 arch rock
 name crate
-x 15
+x 16
 y 7
 end
 arch woodfloor
-x 15
+x 16
 y 8
 end
 arch rock
 name crate
-x 15
+x 16
 y 8
 end
 arch woodfloor
-x 15
+x 16
 y 9
 end
 arch rock
 name crate
-x 15
+x 16
 y 9
 end
 arch woodfloor
-x 15
+x 16
 y 10
 end
 arch rock
 name crate
-x 15
+x 16
 y 10
 end
 arch woodfloor
-x 15
+x 16
 y 11
 end
 arch rock
 name crate
-x 15
+x 16
 y 11
 end
 arch woodfloor
-x 15
+x 16
 y 12
 end
 arch rock
 name crate
-x 15
+x 16
 y 12
 end
 arch woodfloor
-x 15
+x 16
 y 13
 end
 arch rock
 name crate
-x 15
+x 16
 y 13
 end
 arch woodfloor
-x 15
+x 16
 y 14
 end
 arch rock
 name crate
-x 15
+x 16
 y 14
 end
 arch woodfloor
-x 15
+x 16
 y 15
 end
-arch wall_2_1_2
-x 15
+arch rock
+name crate
+x 16
 y 15
 end
 arch woodfloor
 x 16
+y 16
 end
 arch wall_2_1_2
 x 16
+y 16
+end
+arch cobblestones2
+x 16
+y 17
+end
+arch cobblestones2
+x 17
 end
 arch woodfloor
-x 16
+x 17
 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 woodfloor
-x 16
-y 11
-end
-arch woodfloor
-x 16
-y 12
-end
-arch woodfloor
-x 16
-y 13
-end
-arch woodfloor
-x 16
-y 14
-end
-arch woodfloor
-x 16
-y 15
-end
 arch wall_2_1_2
-x 16
-y 15
-end
-arch woodfloor
-x 17
-end
-arch wall_2_1_2
-x 17
-end
-arch woodfloor
 x 17
 y 1
 end
@@ -1962,18 +2123,27 @@ arch woodfloor
 x 17
 y 15
 end
+arch woodfloor
+x 17
+y 16
+end
 arch wall_2_1_2
 x 17
-y 15
+y 16
+end
+arch cobblestones2
+x 17
+y 17
+end
+arch cobblestones2
+x 18
 end
 arch woodfloor
 x 18
+y 1
 end
 arch wall_2_1_2
 x 18
-end
-arch woodfloor
-x 18
 y 1
 end
 arch woodfloor
@@ -2016,406 +2186,422 @@ arch woodfloor
 x 18
 y 11
 end
+arch woodfloor
+x 18
+y 12
+end
+arch woodfloor
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch woodfloor
+x 18
+y 15
+end
+arch woodfloor
+x 18
+y 16
+end
+arch wall_2_1_2
+x 18
+y 16
+end
+arch cobblestones2
+x 18
+y 17
+end
+arch cobblestones2
+x 19
+end
+arch woodfloor
+x 19
+y 1
+end
+arch wall_2_1_2
+x 19
+y 1
+end
+arch woodfloor
+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 mouse
-x 18
-y 11
-end
-arch woodfloor
-x 18
+x 19
 y 12
 end
 arch woodfloor
-x 18
+x 19
 y 13
 end
 arch woodfloor
-x 18
+x 19
 y 14
 end
 arch woodfloor
-x 18
-y 15
-end
-arch wall_2_1_2
-x 18
+x 19
 y 15
 end
 arch woodfloor
 x 19
+y 16
 end
 arch wall_2_1_2
 x 19
+y 16
+end
+arch cobblestones2
+x 19
+y 17
+end
+arch cobblestones2
+x 20
 end
 arch woodfloor
-x 19
+x 20
+y 1
+end
+arch wall_2_1_2
+x 20
 y 1
 end
 arch woodfloor
-x 19
+x 20
 y 2
 end
 arch woodfloor
-x 19
+x 20
 y 3
 end
 arch woodfloor
-x 19
+x 20
 y 4
 end
 arch woodfloor
-x 19
+x 20
 y 5
 end
 arch woodfloor
-x 19
+x 20
 y 6
 end
 arch woodfloor
-x 19
+x 20
 y 7
 end
 arch woodfloor
-x 19
+x 20
 y 8
 end
 arch woodfloor
-x 19
+x 20
 y 9
 end
 arch woodfloor
-x 19
+x 20
 y 10
 end
 arch woodfloor
-x 19
+x 20
 y 11
 end
 arch woodfloor
-x 19
+x 20
 y 12
 end
 arch woodfloor
-x 19
+x 20
 y 13
 end
 arch woodfloor
-x 19
+x 20
 y 14
 end
 arch woodfloor
-x 19
-y 15
-end
-arch wall_2_1_2
-x 19
+x 20
 y 15
 end
 arch woodfloor
 x 20
+y 16
 end
 arch wall_2_1_2
 x 20
+y 16
+end
+arch cobblestones2
+x 20
+y 17
+end
+arch cobblestones2
+x 21
 end
 arch woodfloor
-x 20
+x 21
+y 1
+end
+arch wall_2_1_2
+x 21
 y 1
 end
 arch woodfloor
-x 20
+x 21
 y 2
 end
 arch woodfloor
-x 20
+x 21
 y 3
 end
 arch woodfloor
-x 20
+x 21
 y 4
 end
+arch woodfloor
+x 21
+y 5
+end
 arch wall_1_4
-x 20
-y 4
-end
-arch woodfloor
-x 20
-y 5
-end
-arch rock
-name crate
-x 20
+x 21
 y 5
 end
 arch woodfloor
-x 20
+x 21
 y 6
 end
 arch rock
 name crate
-x 20
+x 21
 y 6
 end
 arch woodfloor
-x 20
+x 21
 y 7
 end
 arch rock
 name crate
-x 20
+x 21
 y 7
 end
 arch woodfloor
-x 20
+x 21
+y 8
+end
+arch rock
+name crate
+x 21
 y 8
 end
 arch woodfloor
-x 20
+x 21
 y 9
 end
 arch woodfloor
-x 20
+x 21
 y 10
 end
 arch woodfloor
-x 20
+x 21
 y 11
 end
 arch woodfloor
-x 20
+x 21
 y 12
 end
 arch woodfloor
-x 20
-y 13
-end
-arch rock
-name crate
-x 20
+x 21
 y 13
 end
 arch woodfloor
-x 20
+x 21
+y 14
+end
+arch rock
+name crate
+x 21
 y 14
 end
 arch woodfloor
-x 20
+x 21
 y 15
 end
+arch woodfloor
+x 21
+y 16
+end
 arch wall_2_1_2
-x 20
-y 15
+x 21
+y 16
 end
 arch generate_mouse
-x 20
-y 15
+x 21
+y 16
+end
+arch cobblestones2
+x 21
+y 17
+end
+arch cobblestones2
+x 22
 end
 arch woodfloor
-x 21
+x 22
+y 1
 end
 arch wall_2_1_2
-x 21
-end
-arch woodfloor
-x 21
+x 22
 y 1
 end
 arch woodfloor
-x 21
+x 22
 y 2
 end
 arch woodfloor
-x 21
+x 22
 y 3
 end
 arch woodfloor
-x 21
+x 22
 y 4
 end
+arch woodfloor
+x 22
+y 5
+end
 arch wall_2_1_2
-x 21
-y 4
-end
-arch woodfloor
-x 21
-y 5
-end
-arch rock
-name crate
-x 21
+x 22
 y 5
 end
 arch woodfloor
-x 21
+x 22
 y 6
 end
 arch rock
 name crate
-x 21
+x 22
 y 6
 end
 arch woodfloor
-x 21
+x 22
 y 7
 end
 arch rock
 name crate
-x 21
+x 22
 y 7
 end
 arch woodfloor
-x 21
+x 22
 y 8
 end
+arch rock
+name crate
+x 22
+y 8
+end
+arch woodfloor
+x 22
+y 9
+end
 arch mouse
-x 21
-y 8
-end
-arch woodfloor
-x 21
+x 22
 y 9
 end
 arch woodfloor
-x 21
+x 22
 y 10
 end
 arch woodfloor
-x 21
+x 22
 y 11
 end
 arch woodfloor
-x 21
+x 22
 y 12
 end
 arch woodfloor
-x 21
+x 22
 y 13
 end
+arch woodfloor
+x 22
+y 14
+end
 arch rock
 name crate
-x 21
-y 13
-end
-arch woodfloor
-x 21
+x 22
 y 14
 end
 arch woodfloor
-x 21
+x 22
 y 15
 end
+arch woodfloor
+x 22
+y 16
+end
 arch wall_2_1_2
-x 21
-y 15
+x 22
+y 16
 end
 arch generate_mouse
-x 21
-y 15
+x 22
+y 16
+end
+arch cobblestones2
+x 22
+y 17
+end
+arch cobblestones2
+x 23
 end
 arch woodfloor
-x 22
-end
-arch wall_2_1_2
-x 22
-end
-arch woodfloor
-x 22
+x 23
 y 1
 end
-arch woodfloor
-x 22
-y 2
-end
-arch woodfloor
-x 22
-y 3
-end
-arch woodfloor
-x 22
-y 4
-end
 arch wall_2_1_2
-x 22
-y 4
-end
-arch woodfloor
-x 22
-y 5
-end
-arch rock
-name crate
-x 22
-y 5
-end
-arch woodfloor
-x 22
-y 6
-end
-arch rock
-name crate
-x 22
-y 6
-end
-arch woodfloor
-x 22
-y 7
-end
-arch rock
-name crate
-x 22
-y 7
-end
-arch woodfloor
-x 22
-y 8
-end
-arch woodfloor
-x 22
-y 9
-end
-arch woodfloor
-x 22
-y 10
-end
-arch woodfloor
-x 22
-y 11
-end
-arch woodfloor
-x 22
-y 12
-end
-arch woodfloor
-x 22
-y 13
-end
-arch rock
-name crate
-x 22
-y 13
-end
-arch woodfloor
-x 22
-y 14
-end
-arch rock
-name crate
-x 22
-y 14
-end
-arch woodfloor
-x 22
-y 15
-end
-arch wall_2_1_2
-x 22
-y 15
-end
-arch woodfloor
-x 23
-end
-arch wall_2_1_2
-x 23
-end
-arch woodfloor
 x 23
 y 1
 end
@@ -2431,16 +2617,11 @@ arch woodfloor
 x 23
 y 4
 end
-arch wall_2_1_2
-x 23
-y 4
-end
 arch woodfloor
 x 23
 y 5
 end
-arch rock
-name crate
+arch wall_2_1_2
 x 23
 y 5
 end
@@ -2475,47 +2656,22 @@ arch woodfloor
 x 23
 y 9
 end
-arch rock
-name crate
-x 23
-y 9
-end
 arch woodfloor
 x 23
 y 10
 end
-arch rock
-name crate
-x 23
-y 10
-end
 arch woodfloor
 x 23
 y 11
 end
-arch rock
-name crate
-x 23
-y 11
-end
 arch woodfloor
 x 23
 y 12
 end
-arch rock
-name crate
-x 23
-y 12
-end
 arch woodfloor
 x 23
 y 13
 end
-arch rock
-name crate
-x 23
-y 13
-end
 arch woodfloor
 x 23
 y 14
@@ -2529,20 +2685,34 @@ arch woodfloor
 x 23
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 23
 y 15
 end
 arch woodfloor
-x 24
+x 23
+y 16
 end
 arch wall_2_1_2
+x 23
+y 16
+end
+arch cobblestones2
+x 23
+y 17
+end
+arch cobblestones2
 x 24
 end
 arch woodfloor
 x 24
 y 1
 end
+arch wall_2_1_2
+x 24
+y 1
+end
 arch woodfloor
 x 24
 y 2
@@ -2555,16 +2725,11 @@ arch woodfloor
 x 24
 y 4
 end
-arch wall_2_1_2
-x 24
-y 4
-end
 arch woodfloor
 x 24
 y 5
 end
-arch rock
-name crate
+arch wall_2_1_2
 x 24
 y 5
 end
@@ -2653,20 +2818,34 @@ arch woodfloor
 x 24
 y 15
 end
-arch wall_2_1_2
+arch rock
+name crate
 x 24
 y 15
 end
 arch woodfloor
-x 25
+x 24
+y 16
 end
 arch wall_2_1_2
+x 24
+y 16
+end
+arch cobblestones2
+x 24
+y 17
+end
+arch cobblestones2
 x 25
 end
 arch woodfloor
 x 25
 y 1
 end
+arch wall_2_1_2
+x 25
+y 1
+end
 arch woodfloor
 x 25
 y 2
@@ -2679,265 +2858,338 @@ arch woodfloor
 x 25
 y 4
 end
+arch woodfloor
+x 25
+y 5
+end
+arch wall_2_1_2
+x 25
+y 5
+end
+arch woodfloor
+x 25
+y 6
+end
+arch rock
+name crate
+x 25
+y 6
+end
+arch woodfloor
+x 25
+y 7
+end
+arch rock
+name crate
+x 25
+y 7
+end
+arch woodfloor
+x 25
+y 8
+end
+arch rock
+name crate
+x 25
+y 8
+end
+arch woodfloor
+x 25
+y 9
+end
+arch rock
+name crate
+x 25
+y 9
+end
+arch woodfloor
+x 25
+y 10
+end
+arch rock
+name crate
+x 25
+y 10
+end
+arch woodfloor
+x 25
+y 11
+end
+arch rock
+name crate
+x 25
+y 11
+end
+arch woodfloor
+x 25
+y 12
+end
+arch rock
+name crate
+x 25
+y 12
+end
+arch woodfloor
+x 25
+y 13
+end
+arch rock
+name crate
+x 25
+y 13
+end
+arch woodfloor
+x 25
+y 14
+end
+arch rock
+name crate
+x 25
+y 14
+end
+arch woodfloor
+x 25
+y 15
+end
+arch rock
+name crate
+x 25
+y 15
+end
+arch woodfloor
+x 25
+y 16
+end
+arch wall_2_1_2
+x 25
+y 16
+end
+arch cobblestones2
+x 25
+y 17
+end
+arch cobblestones2
+x 26
+end
+arch woodfloor
+x 26
+y 1
+end
+arch wall_2_1_2
+x 26
+y 1
+end
+arch woodfloor
+x 26
+y 2
+end
+arch woodfloor
+x 26
+y 3
+end
+arch woodfloor
+x 26
+y 4
+end
+arch woodfloor
+x 26
+y 5
+end
 arch wall_2_2_3
-x 25
-y 4
-end
-arch woodfloor
-x 25
-y 5
-end
-arch wall_2_1_1
-x 25
+x 26
 y 5
 end
 arch woodfloor
-x 25
+x 26
 y 6
 end
 arch wall_2_1_1
-x 25
+x 26
 y 6
 end
 arch woodfloor
-x 25
+x 26
 y 7
 end
 arch wall_2_1_1
-x 25
+x 26
 y 7
 end
 arch woodfloor
-x 25
+x 26
 y 8
 end
 arch wall_2_1_1
-x 25
+x 26
 y 8
 end
 arch woodfloor
-x 25
+x 26
 y 9
 end
 arch wall_2_1_1
-x 25
+x 26
 y 9
 end
 arch woodfloor
-x 25
+x 26
 y 10
 end
 arch wall_2_1_1
-x 25
+x 26
 y 10
 end
 arch woodfloor
-x 25
+x 26
 y 11
 end
 arch wall_2_1_1
-x 25
+x 26
 y 11
 end
 arch woodfloor
-x 25
+x 26
 y 12
 end
 arch wall_2_1_1
-x 25
+x 26
 y 12
 end
 arch woodfloor
-x 25
+x 26
 y 13
 end
 arch wall_2_1_1
-x 25
+x 26
 y 13
 end
 arch woodfloor
-x 25
+x 26
 y 14
 end
 arch wall_2_1_1
-x 25
+x 26
 y 14
 end
 arch woodfloor
-x 25
+x 26
 y 15
 end
+arch wall_2_1_1
+x 26
+y 15
+end
+arch woodfloor
+x 26
+y 16
+end
 arch wall_3_1
-x 25
-y 15
+x 26
+y 16
+end
+arch cobblestones2
+x 26
+y 17
+end
+arch cobblestones2
+x 27
 end
 arch woodfloor
-x 26
+x 27
+y 1
 end
 arch wall_2_1_2
-x 26
-end
-arch woodfloor
-x 26
+x 27
 y 1
 end
 arch woodfloor
-x 26
+x 27
 y 2
 end
 arch woodfloor
-x 26
+x 27
 y 3
 end
 arch woodfloor
-x 26
+x 27
 y 4
 end
 arch woodfloor
-x 26
+x 27
 y 5
 end
 arch woodfloor
-x 26
+x 27
 y 6
 end
 arch woodfloor
-x 26
+x 27
 y 7
 end
 arch woodfloor
-x 26
+x 27
 y 8
 end
 arch woodfloor
-x 26
+x 27
 y 9
 end
 arch woodfloor
-x 26
-y 10
-end
-arch mouse
-x 26
+x 27
 y 10
 end
 arch woodfloor
-x 26
+x 27
+y 11
+end
+arch mouse
+x 27
 y 11
 end
 arch woodfloor
-x 26
+x 27
 y 12
 end
 arch woodfloor
-x 26
+x 27
 y 13
 end
 arch woodfloor
-x 26
+x 27
 y 14
 end
 arch woodfloor
-x 26
+x 27
 y 15
 end
+arch woodfloor
+x 27
+y 16
+end
 arch wall_1_3
-x 26
-y 15
-end
-arch woodfloor
 x 27
+y 16
 end
-arch wall_2_1_2
+arch cobblestones2
 x 27
+y 17
 end
-arch woodfloor
-x 27
-y 1
-end
-arch woodfloor
-x 27
-y 2
-end
-arch woodfloor
-x 27
-y 3
-end
-arch woodfloor
-x 27
-y 4
-end
-arch woodfloor
-x 27
-y 5
-end
-arch woodfloor
-x 27
-y 6
-end
-arch woodfloor
-x 27
-y 7
-end
-arch woodfloor
-x 27
-y 8
-end
-arch woodfloor
-x 27
-y 9
-end
-arch woodfloor
-x 27
-y 10
-end
-arch mouse
-x 27
-y 10
-end
-arch woodfloor
-x 27
-y 11
-end
-arch woodfloor
-x 27
-y 12
-end
-arch mouse
-x 27
-y 12
-end
-arch woodfloor
-x 27
-y 13
-end
-arch woodfloor
-x 27
-y 14
-end
-arch woodfloor
-x 27
-y 15
-end
-arch oakdoor_2
+arch invis_exit
 slaying /world/world_122_116
 hp 17
 sp 41
 x 27
-y 15
+y 17
+end
+arch cobblestones2
+x 28
 end
 arch woodfloor
 x 28
+y 1
 end
 arch wall_2_1_2
 x 28
-end
-arch woodfloor
-x 28
-y 1
-end
-arch random_food
-x 28
 y 1
 end
 arch woodfloor
@@ -2968,20 +3220,20 @@ arch woodfloor
 x 28
 y 8
 end
+arch woodfloor
+x 28
+y 9
+end
+arch woodfloor
+x 28
+y 10
+end
+arch woodfloor
+x 28
+y 11
+end
 arch mouse
 x 28
-y 8
-end
-arch woodfloor
-x 28
-y 9
-end
-arch woodfloor
-x 28
-y 10
-end
-arch woodfloor
-x 28
 y 11
 end
 arch woodfloor
@@ -2992,6 +3244,10 @@ arch woodfloor
 x 28
 y 13
 end
+arch mouse
+x 28
+y 13
+end
 arch woodfloor
 x 28
 y 14
@@ -3000,133 +3256,322 @@ arch woodfloor
 x 28
 y 15
 end
+arch woodfloor
+x 28
+y 16
+end
+arch oakdoor_2
+x 28
+y 16
+end
+arch cobblestones2
+x 28
+y 17
+end
+arch invis_exit
+slaying /world/world_122_116
+hp 17
+sp 41
+x 28
+y 17
+end
+arch cobblestones2
+x 29
+end
+arch woodfloor
+x 29
+y 1
+end
+arch wall_2_1_2
+x 29
+y 1
+end
+arch woodfloor
+x 29
+y 2
+end
+arch random_food
+x 29
+y 2
+end
+arch woodfloor
+x 29
+y 3
+end
+arch woodfloor
+x 29
+y 4
+end
+arch woodfloor
+x 29
+y 5
+end
+arch woodfloor
+x 29
+y 6
+end
+arch woodfloor
+x 29
+y 7
+end
+arch woodfloor
+x 29
+y 8
+end
+arch woodfloor
+x 29
+y 9
+end
+arch mouse
+x 29
+y 9
+end
+arch woodfloor
+x 29
+y 10
+end
+arch woodfloor
+x 29
+y 11
+end
+arch woodfloor
+x 29
+y 12
+end
+arch woodfloor
+x 29
+y 13
+end
+arch woodfloor
+x 29
+y 14
+end
+arch woodfloor
+x 29
+y 15
+end
+arch woodfloor
+x 29
+y 16
+end
 arch wall_1_4
-x 28
-y 15
+x 29
+y 16
+end
+arch cobblestones2
+x 29
+y 17
+end
+arch invis_exit
+slaying /world/world_122_116
+hp 17
+sp 41
+x 29
+y 17
+end
+arch cobblestones2
+x 30
 end
 arch woodfloor
-x 29
+x 30
+y 1
 end
 arch wall_2_2_3
-x 29
-end
-arch woodfloor
-x 29
-y 1
-end
-arch wall_2_1_1
-x 29
+x 30
 y 1
 end
 arch woodfloor
-x 29
+x 30
 y 2
 end
 arch wall_2_1_1
-x 29
+x 30
 y 2
 end
 arch woodfloor
-x 29
+x 30
 y 3
 end
 arch wall_2_1_1
-x 29
+x 30
 y 3
 end
 arch woodfloor
-x 29
+x 30
 y 4
 end
 arch wall_2_1_1
-x 29
+x 30
 y 4
 end
 arch woodfloor
-x 29
+x 30
 y 5
 end
 arch wall_2_1_1
-x 29
+x 30
 y 5
 end
 arch woodfloor
-x 29
+x 30
 y 6
 end
 arch wall_2_1_1
-x 29
+x 30
 y 6
 end
 arch woodfloor
-x 29
+x 30
 y 7
 end
 arch wall_2_1_1
-x 29
+x 30
 y 7
 end
 arch woodfloor
-x 29
+x 30
 y 8
 end
 arch wall_2_1_1
-x 29
+x 30
 y 8
 end
 arch woodfloor
-x 29
+x 30
 y 9
 end
 arch wall_2_1_1
-x 29
+x 30
 y 9
 end
 arch woodfloor
-x 29
+x 30
 y 10
 end
 arch wall_2_1_1
-x 29
+x 30
 y 10
 end
 arch woodfloor
-x 29
+x 30
 y 11
 end
 arch wall_2_1_1
-x 29
+x 30
 y 11
 end
 arch woodfloor
-x 29
+x 30
 y 12
 end
 arch wall_2_1_1
-x 29
+x 30
 y 12
 end
 arch woodfloor
-x 29
+x 30
 y 13
 end
 arch wall_2_1_1
-x 29
+x 30
 y 13
 end
 arch woodfloor
-x 29
+x 30
 y 14
 end
 arch wall_2_1_1
-x 29
+x 30
 y 14
 end
 arch woodfloor
-x 29
+x 30
 y 15
 end
+arch wall_2_1_1
+x 30
+y 15
+end
+arch woodfloor
+x 30
+y 16
+end
 arch wall_2_2_4
-x 29
+x 30
+y 16
+end
+arch cobblestones2
+x 30
+y 17
+end
+arch cobblestones2
+x 31
+end
+arch cobblestones2
+x 31
+y 1
+end
+arch cobblestones2
+x 31
+y 2
+end
+arch cobblestones2
+x 31
+y 3
+end
+arch cobblestones2
+x 31
+y 4
+end
+arch cobblestones2
+x 31
+y 5
+end
+arch cobblestones2
+x 31
+y 6
+end
+arch cobblestones2
+x 31
+y 7
+end
+arch cobblestones2
+x 31
+y 8
+end
+arch cobblestones2
+x 31
+y 9
+end
+arch cobblestones2
+x 31
+y 10
+end
+arch cobblestones2
+x 31
+y 11
+end
+arch cobblestones2
+x 31
+y 12
+end
+arch cobblestones2
+x 31
+y 13
+end
+arch cobblestones2
+x 31
+y 14
+end
+arch cobblestones2
+x 31
 y 15
 end
+arch cobblestones2
+x 31
+y 16
+end
+arch cobblestones2
+x 31
+y 17
+end
diff --git a/world/world_122_116 b/world/world_122_116
index cb76460db..0c4fe6bf5 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -5876,8 +5876,8 @@ end
 arch barn_west
 name Warehouse #4
 slaying /navar_city/warehouse4
-hp 27
-sp 15
+hp 28
+sp 16
 x 16
 y 40
 end