diff --git a/lake_country/Butakis/houses/Sams_house b/lake_country/Butakis/houses/Sams_house
index 94061b562..cfefd3cef 100644
--- a/lake_country/Butakis/houses/Sams_house
+++ b/lake_country/Butakis/houses/Sams_house
@@ -1,13 +1,14 @@
 arch map
+name Sam's house
+difficulty 1
 region lakecountry
-name Sams house
+width 20
+height 18
 msg
 Creator: Kundi, Xue
 Email: xkd@soda.berkeley.edu
 Date: Wed May  3 22:04:51 1995
 endmsg
-width 20
-height 18
 end
 arch woodfloor
 end
@@ -91,10 +92,13 @@ end
 arch wwall_2_2_1
 y 13
 end
+arch swall_1_1_half
+y 13
+end
 arch grass
 y 14
 end
-arch swall_1_1
+arch swall_2_1_1
 y 14
 end
 arch grass
@@ -543,22 +547,22 @@ x 4
 y 14
 end
 arch grate_closed_2
+x 4
+y 14
 speed 0.500000
 speed_left -2.600000
 connected 3
-x 4
-y 14
 end
 arch grass
 x 4
 y 15
 end
 arch grate_closed_2
+x 4
+y 15
 speed 0.500000
 speed_left -2.600000
 connected 3
-x 4
-y 15
 end
 arch grass
 x 4
@@ -701,16 +705,16 @@ x 6
 y 4
 end
 arch igate_closed_2
-speed 0.500000
-connected 11
 x 6
 y 4
+speed 0.500000
+connected 11
 end
 arch woodfloor
 x 6
 y 5
 end
-arch wwall_2_1_1
+arch wwall_1_1
 x 6
 y 5
 end
@@ -727,10 +731,10 @@ x 6
 y 7
 end
 arch igate_closed_2
-speed 0.500000
-connected 12
 x 6
 y 7
+speed 0.500000
+connected 12
 end
 arch woodfloor
 x 6
@@ -810,11 +814,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 7
+y 1
 speed 0.000000
 invisible 1
 connected 20
-x 7
-y 1
 end
 arch woodfloor
 x 7
@@ -824,21 +828,21 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 7
+y 2
 speed 0.000000
 invisible 1
 connected 20
-x 7
-y 2
 end
 arch woodfloor
 x 7
 y 3
 end
 arch igate_closed_1
-speed 0.500000
-connected 14
 x 7
 y 3
+speed 0.500000
+connected 14
 end
 arch woodfloor
 x 7
@@ -860,21 +864,21 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 7
+y 7
 speed 0.000000
 invisible 1
 connected 20
-x 7
-y 7
 end
 arch woodfloor
 x 7
 y 8
 end
 arch igate_closed_1
-speed 0.500000
-connected 13
 x 7
 y 8
+speed 0.500000
+connected 13
 end
 arch woodfloor
 x 7
@@ -970,11 +974,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 8
+y 4
 speed 0.000000
 invisible 1
 connected 20
-x 8
-y 4
 end
 arch woodfloor
 x 8
@@ -992,21 +996,21 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 8
+y 7
 speed 0.000000
 invisible 1
 connected 20
-x 8
-y 7
 end
 arch woodfloor
 x 8
 y 8
 end
 arch igate_closed_1
-speed 0.500000
-connected 13
 x 8
 y 8
+speed 0.500000
+connected 13
 end
 arch woodfloor
 x 8
@@ -1022,19 +1026,19 @@ y 11
 end
 arch mage
 name Sam
-type 0
 Wis 30
 hp 100
 sp 20
 maxsp 100
 dam 10
+x 8
+y 11
 level 10
+type 0
 monster 1
 unaggressive 1
 can_cast_spell 1
-x 8
-y 11
-arch ability_coldspell
+arch spell_icestorm
 end
 end
 arch woodfloor
@@ -1131,7 +1135,7 @@ arch woodfloor
 x 9
 y 8
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 9
 y 8
 end
@@ -1237,11 +1241,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 10
+y 6
 speed 0.000000
 invisible 1
 connected 20
-x 10
-y 6
 end
 arch woodfloor
 x 10
@@ -1251,11 +1255,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 10
+y 7
 speed 0.000000
 invisible 1
 connected 20
-x 10
-y 7
 end
 arch woodfloor
 x 10
@@ -1293,7 +1297,7 @@ arch woodfloor
 x 10
 y 13
 end
-arch wwall_2_1_2
+arch wwall_1_3
 x 10
 y 13
 end
@@ -1372,11 +1376,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 11
+y 6
 speed 0.000000
 invisible 1
 connected 20
-x 11
-y 6
 end
 arch woodfloor
 x 11
@@ -1386,11 +1390,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 11
+y 7
 speed 0.000000
 invisible 1
 connected 20
-x 11
-y 7
 end
 arch woodfloor
 x 11
@@ -1406,10 +1410,10 @@ y 10
 end
 arch igate_closed_1
 name door
-speed 0.500000
-connected 31
 x 11
 y 10
+speed 0.500000
+connected 31
 end
 arch woodfloor
 x 11
@@ -1419,11 +1423,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 11
+y 11
 speed 0.000000
 invisible 1
 connected 20
-x 11
-y 11
 end
 arch woodfloor
 x 11
@@ -1435,10 +1439,10 @@ y 13
 end
 arch igate_closed_1
 name left door
-speed 0.500000
-connected 1
 x 11
 y 13
+speed 0.500000
+connected 1
 end
 arch cobblestones2
 x 11
@@ -1477,11 +1481,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 12
+y 1
 speed 0.000000
 invisible 1
 connected 20
-x 12
-y 1
 end
 arch woodfloor
 x 12
@@ -1491,17 +1495,17 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 12
+y 2
 speed 0.000000
 invisible 1
 connected 20
-x 12
-y 2
 end
 arch woodfloor
 x 12
 y 3
 end
-arch wwall_2_1_2
+arch wwall_1_3
 x 12
 y 3
 end
@@ -1521,11 +1525,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 12
+y 6
 speed 0.000000
 invisible 1
 connected 20
-x 12
-y 6
 end
 arch woodfloor
 x 12
@@ -1535,11 +1539,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 12
+y 7
 speed 0.000000
 invisible 1
 connected 20
-x 12
-y 7
 end
 arch woodfloor
 x 12
@@ -1555,10 +1559,10 @@ y 10
 end
 arch igate_closed_1
 name door
-speed 0.500000
-connected 31
 x 12
 y 10
+speed 0.500000
+connected 31
 end
 arch woodfloor
 x 12
@@ -1568,11 +1572,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 12
+y 11
 speed 0.000000
 invisible 1
 connected 20
-x 12
-y 11
 end
 arch woodfloor
 x 12
@@ -1584,10 +1588,10 @@ y 13
 end
 arch igate_closed_1
 name right door
-speed 0.500000
-connected 1
 x 12
 y 13
+speed 0.500000
+connected 1
 end
 arch cobblestones2
 x 12
@@ -1631,10 +1635,10 @@ x 13
 y 3
 end
 arch igate_closed_1
-speed 0.500000
-connected 15
 x 13
 y 3
+speed 0.500000
+connected 15
 end
 arch woodfloor
 x 13
@@ -1664,7 +1668,7 @@ arch woodfloor
 x 13
 y 10
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 13
 y 10
 end
@@ -1680,17 +1684,17 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 13
+y 12
 speed 0.000000
 invisible 1
 connected 20
-x 13
-y 12
 end
 arch woodfloor
 x 13
 y 13
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 13
 y 13
 end
@@ -1736,7 +1740,7 @@ arch woodfloor
 x 14
 y 3
 end
-arch wwall_2_1_2
+arch wwall_1_4
 x 14
 y 3
 end
@@ -1752,11 +1756,11 @@ arch teleporter
 slaying ../arena
 hp 10
 sp 19
+x 14
+y 5
 speed 0.000000
 invisible 1
 connected 20
-x 14
-y 5
 end
 arch woodfloor
 x 14
@@ -1940,9 +1944,9 @@ x 15
 y 14
 end
 arch door_look_2
-no_pass 0
 x 15
 y 14
+no_pass 0
 end
 arch woodfloor
 x 15
@@ -2083,8 +2087,8 @@ x 17
 end
 arch button_plate
 name 11
-connected 11
 x 17
+connected 11
 end
 arch woodfloor
 x 17
@@ -2092,9 +2096,9 @@ y 1
 end
 arch button_plate
 name 14
-connected 14
 x 17
 y 1
+connected 14
 end
 arch woodfloor
 x 17
@@ -2102,9 +2106,9 @@ y 2
 end
 arch button_plate
 name 18
-connected 18
 x 17
 y 2
+connected 18
 end
 arch woodfloor
 x 17
@@ -2160,9 +2164,9 @@ y 10
 end
 arch button_plate
 name 3(guardian door)
-connected 3
 x 17
 y 10
+connected 3
 end
 arch woodfloor
 x 17
@@ -2170,9 +2174,9 @@ y 11
 end
 arch button_plate
 name 2(inner door trigger)
-connected 2
 x 17
 y 11
+connected 2
 end
 arch woodfloor
 x 17
@@ -2225,8 +2229,8 @@ x 18
 end
 arch button_plate
 name 12
-connected 12
 x 18
+connected 12
 end
 arch woodfloor
 x 18
@@ -2234,11 +2238,11 @@ y 1
 end
 arch spikes_open
 name 2(inner doors trigger)
+x 18
+y 1
 speed 0.500000
 value 1
 connected 2
-x 18
-y 1
 end
 arch boulder
 x 18
@@ -2250,9 +2254,9 @@ y 2
 end
 arch button_plate
 name 18
-connected 18
 x 18
 y 2
+connected 18
 end
 arch woodfloor
 x 18
@@ -2260,10 +2264,10 @@ y 3
 end
 arch block_door_closed
 name 18
-speed 0.500000
-connected 18
 x 18
 y 3
+speed 0.500000
+connected 18
 end
 arch woodfloor
 x 18
@@ -2291,9 +2295,9 @@ y 8
 end
 arch button_plate
 name 31
-connected 31
 x 18
 y 8
+connected 31
 end
 arch woodfloor
 x 18
@@ -2317,11 +2321,11 @@ y 11
 end
 arch spikes_open
 name 1
+x 18
+y 11
 speed 0.500000
 value 1
 connected 1
-x 18
-y 11
 end
 arch boulder
 x 18
@@ -2348,9 +2352,9 @@ x 18
 y 14
 end
 arch button_lever
-connected 1
 x 18
 y 14
+connected 1
 end
 arch woodfloor
 x 18
@@ -2360,11 +2364,15 @@ arch wwall_2_1_2
 x 18
 y 15
 end
+arch swall_1_1_half
+x 18
+y 15
+end
 arch grass
 x 18
 y 16
 end
-arch swall_1_3
+arch swall_2_2_4
 x 18
 y 16
 end
@@ -2377,8 +2385,8 @@ x 19
 end
 arch button_plate
 name 13
-connected 13
 x 19
+connected 13
 end
 arch woodfloor
 x 19
@@ -2386,9 +2394,9 @@ y 1
 end
 arch button_plate
 name 15
-connected 15
 x 19
 y 1
+connected 15
 end
 arch woodfloor
 x 19
@@ -2396,9 +2404,9 @@ y 2
 end
 arch button_plate
 name 18
-connected 18
 x 19
 y 2
+connected 18
 end
 arch woodfloor
 x 19
@@ -2406,9 +2414,9 @@ y 3
 end
 arch button_small
 name 20
-connected 20
 x 19
 y 3
+connected 20
 end
 arch woodfloor
 x 19
@@ -2432,11 +2440,11 @@ y 7
 end
 arch spikes_open
 name 2
+x 19
+y 7
 speed 0.500000
 value 1
 connected 2
-x 19
-y 7
 end
 arch boulder
 x 19
@@ -2448,9 +2456,9 @@ y 8
 end
 arch button_plate
 name 31
-connected 31
 x 19
 y 8
+connected 31
 end
 arch woodfloor
 x 19