diff --git a/pup_land/s_f/ki2 b/pup_land/s_f/ki2
index adc233b37..774461f2e 100755
--- a/pup_land/s_f/ki2
+++ b/pup_land/s_f/ki2
@@ -1,13 +1,13 @@
 arch map
-region pupland
 name KI2
+region pupland
+width 10
+height 14
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Feb  8 01:49:16 1996
 endmsg
-x 10
-y 14
 end
 arch woodfloor
 end
@@ -104,6 +104,7 @@ end
 arch lightningwall_5
 x 1
 y 1
+blocksview 0
 end
 arch woodfloor
 x 1
@@ -158,12 +159,12 @@ x 1
 y 8
 end
 arch mover_1
+x 1
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 1
-y 8
 end
 arch woodfloor
 x 1
@@ -184,6 +185,7 @@ end
 arch lightningwall_1
 x 1
 y 12
+blocksview 0
 end
 arch woodfloor
 x 1
@@ -208,11 +210,11 @@ x 2
 y 1
 end
 arch button_small
-protected 51
+x 2
+y 2
 invisible 1
 connected 51
-x 2
-y 2
+protected 51
 end
 arch woodfloor
 x 2
@@ -223,11 +225,11 @@ x 2
 y 2
 end
 arch button_small
-protected 41
+x 2
+y 3
 invisible 1
 connected 41
-x 2
-y 3
+protected 41
 end
 arch woodfloor
 x 2
@@ -238,11 +240,11 @@ x 2
 y 3
 end
 arch button_small
-protected 31
+x 2
+y 4
 invisible 1
 connected 31
-x 2
-y 4
+protected 31
 end
 arch woodfloor
 x 2
@@ -253,11 +255,11 @@ x 2
 y 4
 end
 arch button_small
-protected 21
-invisible 1
-connected 21
 x 2
 y 5
+invisible 1
+connected 21
+protected 21
 end
 arch woodfloor
 x 2
@@ -288,65 +290,65 @@ x 2
 y 8
 end
 arch mover_1
+x 2
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 2
-y 8
 end
 arch grate_open_1
+x 2
+y 8
 speed 0.500000
-protected 51
 value 1
 connected 51
-x 2
-y 8
+protected 51
 end
 arch woodfloor
 x 2
 y 9
 end
 arch grate_open_1
+x 2
+y 9
 speed 0.500000
-protected 41
 value 1
 connected 41
-x 2
-y 9
+protected 41
 end
 arch woodfloor
 x 2
 y 10
 end
 arch grate_open_1
+x 2
+y 10
 speed 0.500000
-protected 31
 value 1
 connected 31
-x 2
-y 10
+protected 31
 end
 arch woodfloor
 x 2
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 21
-value 1
-connected 21
 x 2
 y 11
+speed 0.500000
+value 1
+connected 21
+protected 21
 end
 arch woodfloor
 x 2
 y 12
 end
 arch ytree
-no_pass 1
 x 2
 y 12
+no_pass 1
 end
 arch woodfloor
 x 2
@@ -371,11 +373,11 @@ x 3
 y 1
 end
 arch button_small
-protected 52
+x 3
+y 2
 invisible 1
 connected 52
-x 3
-y 2
+protected 52
 end
 arch woodfloor
 x 3
@@ -386,11 +388,11 @@ x 3
 y 2
 end
 arch button_small
-protected 42
+x 3
+y 3
 invisible 1
 connected 42
-x 3
-y 3
+protected 42
 end
 arch woodfloor
 x 3
@@ -401,11 +403,11 @@ x 3
 y 3
 end
 arch button_small
-protected 32
+x 3
+y 4
 invisible 1
 connected 32
-x 3
-y 4
+protected 32
 end
 arch woodfloor
 x 3
@@ -416,11 +418,11 @@ x 3
 y 4
 end
 arch button_small
-protected 22
-invisible 1
-connected 22
 x 3
 y 5
+invisible 1
+connected 22
+protected 22
 end
 arch woodfloor
 x 3
@@ -451,56 +453,56 @@ x 3
 y 8
 end
 arch mover_1
+x 3
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 3
-y 8
 end
 arch grate_open_1
+x 3
+y 8
 speed 0.500000
-protected 52
 value 1
 connected 52
-x 3
-y 8
+protected 52
 end
 arch woodfloor
 x 3
 y 9
 end
 arch grate_open_1
+x 3
+y 9
 speed 0.500000
-protected 42
 value 1
 connected 42
-x 3
-y 9
+protected 42
 end
 arch woodfloor
 x 3
 y 10
 end
 arch grate_open_1
+x 3
+y 10
 speed 0.500000
-protected 32
 value 1
 connected 32
-x 3
-y 10
+protected 32
 end
 arch woodfloor
 x 3
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 22
-value 1
-connected 22
 x 3
 y 11
+speed 0.500000
+value 1
+connected 22
+protected 22
 end
 arch woodfloor
 x 3
@@ -533,11 +535,11 @@ x 4
 y 1
 end
 arch button_small
-protected 53
+x 4
+y 2
 invisible 1
 connected 53
-x 4
-y 2
+protected 53
 end
 arch woodfloor
 x 4
@@ -548,11 +550,11 @@ x 4
 y 2
 end
 arch button_small
-protected 43
+x 4
+y 3
 invisible 1
 connected 43
-x 4
-y 3
+protected 43
 end
 arch woodfloor
 x 4
@@ -563,11 +565,11 @@ x 4
 y 3
 end
 arch button_small
-protected 33
+x 4
+y 4
 invisible 1
 connected 33
-x 4
-y 4
+protected 33
 end
 arch woodfloor
 x 4
@@ -578,11 +580,11 @@ x 4
 y 4
 end
 arch button_small
-protected 23
-invisible 1
-connected 23
 x 4
 y 5
+invisible 1
+connected 23
+protected 23
 end
 arch woodfloor
 x 4
@@ -613,56 +615,56 @@ x 4
 y 8
 end
 arch mover_1
+x 4
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 4
-y 8
 end
 arch grate_open_1
+x 4
+y 8
 speed 0.500000
-protected 53
 value 1
 connected 53
-x 4
-y 8
+protected 53
 end
 arch woodfloor
 x 4
 y 9
 end
 arch grate_open_1
+x 4
+y 9
 speed 0.500000
-protected 43
 value 1
 connected 43
-x 4
-y 9
+protected 43
 end
 arch woodfloor
 x 4
 y 10
 end
 arch grate_open_1
+x 4
+y 10
 speed 0.500000
-protected 33
 value 1
 connected 33
-x 4
-y 10
+protected 33
 end
 arch woodfloor
 x 4
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 23
-value 1
-connected 23
 x 4
 y 11
+speed 0.500000
+value 1
+connected 23
+protected 23
 end
 arch note
 msg
@@ -677,9 +679,9 @@ x 4
 y 12
 end
 arch ytree
-no_pass 1
 x 4
 y 12
+no_pass 1
 end
 arch woodfloor
 x 4
@@ -704,11 +706,11 @@ x 5
 y 1
 end
 arch button_small
-protected 54
+x 5
+y 2
 invisible 1
 connected 54
-x 5
-y 2
+protected 54
 end
 arch woodfloor
 x 5
@@ -719,11 +721,11 @@ x 5
 y 2
 end
 arch button_small
-protected 44
+x 5
+y 3
 invisible 1
 connected 44
-x 5
-y 3
+protected 44
 end
 arch woodfloor
 x 5
@@ -734,11 +736,11 @@ x 5
 y 3
 end
 arch button_small
-protected 34
+x 5
+y 4
 invisible 1
 connected 34
-x 5
-y 4
+protected 34
 end
 arch woodfloor
 x 5
@@ -749,11 +751,11 @@ x 5
 y 4
 end
 arch button_small
-protected 24
-invisible 1
-connected 24
 x 5
 y 5
+invisible 1
+connected 24
+protected 24
 end
 arch woodfloor
 x 5
@@ -784,56 +786,56 @@ x 5
 y 8
 end
 arch mover_1
+x 5
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 5
-y 8
 end
 arch grate_open_1
+x 5
+y 8
 speed 0.500000
-protected 54
 value 1
 connected 54
-x 5
-y 8
+protected 54
 end
 arch woodfloor
 x 5
 y 9
 end
 arch grate_open_1
+x 5
+y 9
 speed 0.500000
-protected 44
 value 1
 connected 44
-x 5
-y 9
+protected 44
 end
 arch woodfloor
 x 5
 y 10
 end
 arch grate_open_1
+x 5
+y 10
 speed 0.500000
-protected 34
 value 1
 connected 34
-x 5
-y 10
+protected 34
 end
 arch woodfloor
 x 5
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 24
-value 1
-connected 24
 x 5
 y 11
+speed 0.500000
+value 1
+connected 24
+protected 24
 end
 arch note
 msg
@@ -850,9 +852,9 @@ x 5
 y 12
 end
 arch ytree
-no_pass 1
 x 5
 y 12
+no_pass 1
 end
 arch woodfloor
 x 5
@@ -884,11 +886,11 @@ x 6
 y 1
 end
 arch button_small
-protected 55
+x 6
+y 2
 invisible 1
 connected 55
-x 6
-y 2
+protected 55
 end
 arch woodfloor
 x 6
@@ -899,11 +901,11 @@ x 6
 y 2
 end
 arch button_small
-protected 45
+x 6
+y 3
 invisible 1
 connected 45
-x 6
-y 3
+protected 45
 end
 arch woodfloor
 x 6
@@ -914,11 +916,11 @@ x 6
 y 3
 end
 arch button_small
-protected 35
+x 6
+y 4
 invisible 1
 connected 35
-x 6
-y 4
+protected 35
 end
 arch woodfloor
 x 6
@@ -929,11 +931,11 @@ x 6
 y 4
 end
 arch button_small
-protected 25
-invisible 1
-connected 25
 x 6
 y 5
+invisible 1
+connected 25
+protected 25
 end
 arch woodfloor
 x 6
@@ -964,56 +966,56 @@ x 6
 y 8
 end
 arch mover_1
+x 6
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 6
-y 8
 end
 arch grate_open_1
+x 6
+y 8
 speed 0.500000
-protected 55
 value 1
 connected 55
-x 6
-y 8
+protected 55
 end
 arch woodfloor
 x 6
 y 9
 end
 arch grate_open_1
+x 6
+y 9
 speed 0.500000
-protected 45
 value 1
 connected 45
-x 6
-y 9
+protected 45
 end
 arch woodfloor
 x 6
 y 10
 end
 arch grate_open_1
+x 6
+y 10
 speed 0.500000
-protected 35
 value 1
 connected 35
-x 6
-y 10
+protected 35
 end
 arch woodfloor
 x 6
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 25
-value 1
-connected 25
 x 6
 y 11
+speed 0.500000
+value 1
+connected 25
+protected 25
 end
 arch woodfloor
 x 6
@@ -1053,11 +1055,11 @@ x 7
 y 1
 end
 arch button_small
-protected 56
+x 7
+y 2
 invisible 1
 connected 56
-x 7
-y 2
+protected 56
 end
 arch woodfloor
 x 7
@@ -1068,11 +1070,11 @@ x 7
 y 2
 end
 arch button_small
-protected 46
+x 7
+y 3
 invisible 1
 connected 46
-x 7
-y 3
+protected 46
 end
 arch woodfloor
 x 7
@@ -1083,11 +1085,11 @@ x 7
 y 3
 end
 arch button_small
-protected 36
+x 7
+y 4
 invisible 1
 connected 36
-x 7
-y 4
+protected 36
 end
 arch woodfloor
 x 7
@@ -1098,11 +1100,11 @@ x 7
 y 4
 end
 arch button_small
-protected 26
-invisible 1
-connected 26
 x 7
 y 5
+invisible 1
+connected 26
+protected 26
 end
 arch woodfloor
 x 7
@@ -1133,65 +1135,65 @@ x 7
 y 8
 end
 arch mover_1
+x 7
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 7
-y 8
 end
 arch grate_open_1
+x 7
+y 8
 speed 0.500000
-protected 56
 value 1
 connected 56
-x 7
-y 8
+protected 56
 end
 arch woodfloor
 x 7
 y 9
 end
 arch grate_open_1
+x 7
+y 9
 speed 0.500000
-protected 46
 value 1
 connected 46
-x 7
-y 9
+protected 46
 end
 arch woodfloor
 x 7
 y 10
 end
 arch grate_open_1
+x 7
+y 10
 speed 0.500000
-protected 36
 value 1
 connected 36
-x 7
-y 10
+protected 36
 end
 arch woodfloor
 x 7
 y 11
 end
 arch grate_open_1
-speed 0.500000
-protected 26
-value 1
-connected 26
 x 7
 y 11
+speed 0.500000
+value 1
+connected 26
+protected 26
 end
 arch woodfloor
 x 7
 y 12
 end
 arch ytree
-no_pass 1
 x 7
 y 12
+no_pass 1
 end
 arch woodfloor
 x 7
@@ -1214,6 +1216,7 @@ end
 arch lightningwall_5
 x 8
 y 1
+blocksview 0
 end
 arch woodfloor
 x 8
@@ -1268,12 +1271,12 @@ x 8
 y 8
 end
 arch mover_1
+x 8
+y 8
 speed 1.000000
 speed_left -3.980000
 level 1
 attacktype 1
-x 8
-y 8
 end
 arch woodfloor
 x 8
@@ -1294,6 +1297,7 @@ end
 arch lightningwall_1
 x 8
 y 12
+blocksview 0
 end
 arch woodfloor
 x 8