diff --git a/lake_country/Butakis/Butakis0 b/lake_country/Butakis/Butakis0
index b89dc6b35..8b320adae 100644
--- a/lake_country/Butakis/Butakis0
+++ b/lake_country/Butakis/Butakis0
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Mar 27 12:56:00 1995
 endmsg
-x 24
-y 36
+width 24
+height 36
 end
 arch grass
 end
@@ -744,9 +744,9 @@ x 3
 y 4
 end
 arch guard
+speed_left -0.940000
 x 3
 y 4
-speed_left -0.940000
 end
 arch dungeon_floor
 x 3
@@ -757,9 +757,9 @@ x 3
 y 6
 end
 arch guard
+speed_left -0.940000
 x 3
 y 6
-speed_left -0.940000
 end
 arch grass
 x 3
@@ -932,9 +932,9 @@ x 4
 y 4
 end
 arch guard
+speed_left -0.940000
 x 4
 y 4
-speed_left -0.940000
 end
 arch dungeon_floor
 x 4
@@ -945,9 +945,9 @@ x 4
 y 6
 end
 arch guard
+speed_left -0.940000
 x 4
 y 6
-speed_left -0.940000
 end
 arch grass
 x 4
@@ -2286,9 +2286,9 @@ x 10
 y 6
 end
 arch light_guard
+speed_left -0.940000
 x 10
 y 6
-speed_left -0.940000
 end
 arch grass
 x 10
@@ -2827,14 +2827,14 @@ y 29
 end
 arch sign
 msg
-  Prepare enough platinum, rubies and
+Prepare enough platinum, rubies and
 diamonds. For you need these to gamble.
-Also prepare scrolls of recall to get 
+Also prepare scrolls of recall to get
 out of impasses otherwise you may die
 an agonizing death
-  On the first level, each altar takes
+On the first level, each altar takes
 100 platinum coins to operate.
-  On the second and first level, it
+On the second and first level, it
 takes a lot more. Luck are really hard
 to come by there, but rewards are huge.
 endmsg
@@ -3238,18 +3238,18 @@ x 14
 y 23
 end
 arch knight
+speed_left -1.500000
 x 14
 y 23
-speed_left -1.500000
 end
 arch grass
 x 14
 y 24
 end
 arch knight
+speed_left -1.500000
 x 14
 y 24
-speed_left -1.500000
 end
 arch grass
 x 14
@@ -3264,18 +3264,18 @@ x 14
 y 26
 end
 arch knight
+speed_left -1.500000
 x 14
 y 26
-speed_left -1.500000
 end
 arch grass
 x 14
 y 27
 end
 arch knight
+speed_left -1.500000
 x 14
 y 27
-speed_left -1.500000
 end
 arch grass
 x 14
@@ -3464,18 +3464,18 @@ x 15
 y 23
 end
 arch knight
+speed_left -1.500000
 x 15
 y 23
-speed_left -1.500000
 end
 arch grass
 x 15
 y 24
 end
 arch knight
+speed_left -1.500000
 x 15
 y 24
-speed_left -1.500000
 end
 arch grass
 x 15
@@ -3490,18 +3490,18 @@ x 15
 y 26
 end
 arch knight
+speed_left -1.500000
 x 15
 y 26
-speed_left -1.500000
 end
 arch grass
 x 15
 y 27
 end
 arch knight
+speed_left -1.500000
 x 15
 y 27
-speed_left -1.500000
 end
 arch grass
 x 15
@@ -5449,48 +5449,18 @@ arch guild
 x 2
 y 14
 end
-More
-arch guild_2
-x 3
-y 14
-end
-More
-arch guild_3
-x 2
-y 15
-end
-More
-arch guild_4
-x 3
-y 15
-end
 arch barrack_up
 x 2
 y 29
 end
-More
-arch barrack_up_2
-x 2
-y 30
-end
 arch barrack_up
 x 3
 y 2
 end
-More
-arch barrack_up_2
-x 3
-y 3
-end
 arch house_up
 x 3
 y 9
 end
-More
-arch house_up_2
-x 3
-y 10
-end
 arch store_general
 slaying B_gshop
 hp 1
@@ -5498,75 +5468,26 @@ sp 1
 x 3
 y 12
 end
-More
-arch store_general_2
-slaying B_gshop
-hp 1
-sp 1
-x 4
-y 12
-end
-More
-arch store_general_3
-slaying B_gshop
-hp 1
-sp 1
-x 3
-y 13
-end
-More
-arch store_general_4
-slaying B_gshop
-hp 1
-sp 1
-x 4
-y 13
-end
 arch barrack_up
 x 3
 y 29
 end
-More
-arch barrack_up_2
-x 3
-y 30
-end
 arch barrack_up
 x 4
 y 2
 end
-More
-arch barrack_up_2
-x 4
-y 3
-end
 arch barrack_up
 x 4
 y 29
 end
-More
-arch barrack_up_2
-x 4
-y 30
-end
 arch barrack_up
 x 5
 y 2
 end
-More
-arch barrack_up_2
-x 5
-y 3
-end
 arch barrack_up
 x 5
 y 29
 end
-More
-arch barrack_up_2
-x 5
-y 30
-end
 arch church
 name Royal Church
 slaying church0
@@ -5575,33 +5496,6 @@ sp 28
 x 6
 y 22
 end
-More
-arch church_2
-name Royal Church
-slaying church0
-hp 9
-sp 28
-x 7
-y 22
-end
-More
-arch church_3
-name Royal Church
-slaying church0
-hp 9
-sp 28
-x 6
-y 23
-end
-More
-arch church_4
-name Royal Church
-slaying church0
-hp 9
-sp 28
-x 7
-y 23
-end
 arch courthouse
 name Royal Library
 slaying Rlib1
@@ -5610,51 +5504,14 @@ sp 8
 x 6
 y 25
 end
-More
-arch courthouse_2
-name Royal Library
-slaying Rlib1
-hp 2
-sp 8
-x 7
-y 25
-end
-More
-arch courthouse_3
-name Royal Library
-slaying Rlib1
-hp 2
-sp 8
-x 6
-y 26
-end
-More
-arch courthouse_4
-name Royal Library
-slaying Rlib1
-hp 2
-sp 8
-x 7
-y 26
-end
 arch barrack_up
 x 6
 y 29
 end
-More
-arch barrack_up_2
-x 6
-y 30
-end
 arch house_up
 x 7
 y 8
 end
-More
-arch house_up_2
-x 7
-y 9
-end
 arch city_tower
 name towers of luck
 slaying luck1
@@ -5663,15 +5520,6 @@ sp 16
 x 10
 y 30
 end
-More
-arch city_tower_2
-name towers of luck
-slaying luck1
-hp 3
-sp 16
-x 10
-y 31
-end
 arch city_tower
 name tower of luck
 slaying luck1
@@ -5680,15 +5528,6 @@ sp 5
 x 11
 y 29
 end
-More
-arch city_tower_2
-name tower of luck
-slaying luck1
-hp 3
-sp 5
-x 11
-y 30
-end
 arch city_tower
 name tower of luck
 slaying luck1
@@ -5697,15 +5536,6 @@ sp 15
 x 11
 y 31
 end
-More
-arch city_tower_2
-name tower of luck
-slaying luck1
-hp 19
-sp 15
-x 11
-y 32
-end
 arch city_tower
 name tower of luck
 slaying luck1
@@ -5714,15 +5544,6 @@ sp 5
 x 12
 y 30
 end
-More
-arch city_tower_2
-name tower of luck
-slaying luck1
-hp 17
-sp 5
-x 12
-y 31
-end
 arch store_weapons
 slaying B_wshop
 hp 1
@@ -5730,48 +5551,14 @@ sp 8
 x 13
 y 6
 end
-More
-arch store_weapons_2
-slaying B_wshop
-hp 1
-sp 8
-x 14
-y 6
-end
-More
-arch store_weapons_3
-slaying B_wshop
-hp 1
-sp 8
-x 13
-y 7
-end
-More
-arch store_weapons_4
-slaying B_wshop
-hp 1
-sp 8
-x 14
-y 7
-end
 arch barrack_up
 x 14
 y 2
 end
-More
-arch barrack_up_2
-x 14
-y 3
-end
 arch barrack_up
 x 15
 y 2
 end
-More
-arch barrack_up_2
-x 15
-y 3
-end
 arch barn
 name Arena
 slaying arena
@@ -5780,152 +5567,30 @@ sp 20
 x 15
 y 15
 end
-More
-arch barn_2
-name Arena
-slaying arena
-hp 1
-sp 20
-x 16
-y 15
-end
-More
-arch barn_3
-name Arena
-slaying arena
-hp 1
-sp 20
-x 15
-y 16
-end
-More
-arch barn_4
-name Arena
-slaying arena
-hp 1
-sp 20
-x 16
-y 16
-end
 arch barrack_up
 x 16
 y 2
 end
-More
-arch barrack_up_2
-x 16
-y 3
-end
 arch house_up
 x 16
 y 8
 end
-More
-arch house_up_2
-x 16
-y 9
-end
 arch barrack_long
 x 17
 y 17
 end
-More
-arch barrack_long_2
-x 18
-y 17
-end
 arch palace
 x 17
 y 23
 end
-More
-arch palace_2
-x 18
-y 23
-end
-More
-arch palace_3
-x 19
-y 23
-end
-More
-arch palace_4
-x 20
-y 23
-end
-More
-arch palace_5
-x 21
-y 23
-end
-More
-arch palace_6
-x 17
-y 24
-end
-More
-arch palace_7
-x 18
-y 24
-end
-More
-arch palace_8
-x 19
-y 24
-end
-More
-arch palace_9
-x 20
-y 24
-end
-More
-arch palace_10
-x 21
-y 24
-end
-More
-arch palace_11
-x 17
-y 25
-end
-More
-arch palace_12
-x 18
-y 25
-end
-More
-arch palace_13
-x 19
-y 25
-end
-More
-arch palace_14
-x 20
-y 25
-end
-More
-arch palace_15
-x 21
-y 25
-end
 arch barrack_up
 x 17
 y 29
 end
-More
-arch barrack_up_2
-x 17
-y 30
-end
 arch barrack_up
 x 18
 y 29
 end
-More
-arch barrack_up_2
-x 18
-y 30
-end
 arch inn
 name Inn, White Pigeon
 slaying inn
@@ -5934,33 +5599,14 @@ sp 14
 x 19
 y 8
 end
-More
-arch inn_2
-name Inn, White Pigeon
-slaying inn
-hp 8
-sp 14
-x 20
-y 8
-end
 arch house_up
 x 19
 y 11
 end
-More
-arch house_up_2
-x 19
-y 12
-end
 arch barrack_up
 x 19
 y 29
 end
-More
-arch barrack_up_2
-x 19
-y 30
-end
 arch prison
 slaying prison0
 hp 12
@@ -5968,64 +5614,15 @@ sp 20
 x 20
 y 2
 end
-More
-arch prison_2
-slaying prison0
-hp 12
-sp 20
-x 21
-y 2
-end
-More
-arch prison_3
-slaying prison0
-hp 12
-sp 20
-x 20
-y 3
-end
-More
-arch prison_4
-slaying prison0
-hp 12
-sp 20
-x 21
-y 3
-end
 arch barn
 x 20
 y 15
 end
-More
-arch barn_2
-x 21
-y 15
-end
-More
-arch barn_3
-x 20
-y 16
-end
-More
-arch barn_4
-x 21
-y 16
-end
 arch barrack_up
 x 20
 y 29
 end
-More
-arch barrack_up_2
-x 20
-y 30
-end
 arch barrack_up
 x 21
 y 29
 end
-More
-arch barrack_up_2
-x 21
-y 30
-end
diff --git a/pup_land/terminal b/pup_land/terminal
index c443ead47..f194d780d 100644
--- a/pup_land/terminal
+++ b/pup_land/terminal
@@ -5,9 +5,9 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Fri Apr  5 02:03:21 1996
 endmsg
-hp 10
-x 21
-y 18
+width 21
+height 18
+enter_x 10
 end
 arch biglake_center
 name sky
@@ -121,15 +121,15 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 1
 y 8
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 1
 y 9
-no_pass 0
 end
 arch biglake_center
 name sky
@@ -212,9 +212,9 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 2
 y 8
-no_pass 0
 end
 arch cobblestones2
 x 2
@@ -301,9 +301,9 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 3
 y 8
-no_pass 0
 end
 arch cobblestones2
 x 3
@@ -612,9 +612,9 @@ y 11
 end
 arch fog
 name cloud
+blocksview 0
 x 6
 y 11
-blocksview 0
 end
 arch grass
 x 6
@@ -685,9 +685,9 @@ y 5
 end
 arch fog
 name cloud
+blocksview 0
 x 7
 y 5
-blocksview 0
 end
 arch grass
 x 7
@@ -697,7 +697,7 @@ arch grass
 x 7
 y 7
 end
-arch cobblestones2
+arch grass
 x 7
 y 8
 end
@@ -719,9 +719,9 @@ y 12
 end
 arch fog
 name cloud
+blocksview 0
 x 7
 y 12
-blocksview 0
 end
 arch grass
 x 7
@@ -844,15 +844,15 @@ x 9
 end
 arch biglake_center
 name sky
+no_pass 0
 x 9
 y 1
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 9
 y 2
-no_pass 0
 end
 arch cobblestones2
 x 9
@@ -897,17 +897,17 @@ To solve quests, information is
 very important. Talking to the NPCs
 is inevitable in Pupland.
 -------------------------
-These maps are created by 
+These maps are created by
 kawamoto@ics.es.osaka-u.ac.jp
- <kawamoto, Lau, Aquint>
+<kawamoto, Lau, Aquint>
 s-nisita@ics.es.osaka-u.ac.jp
- <hoge, hiropon, oyoyo>
+<hoge, hiropon, oyoyo>
 k-yosida@ics.es.osaka-u.ac.jp
- <Fog, Seer>
+<Fog, Seer>
 h-okuda@ics.es.osaka-u.ac.jp
- <eXXXtreme, Xtreme>
+<eXXXtreme, Xtreme>
 red.blaze@gmx.net
- <Andreas Vogl>
+<Andreas Vogl>
 Please send us your impressions :-)
 endmsg
 x 9
@@ -935,15 +935,15 @@ y 14
 end
 arch biglake_center
 name sky
+no_pass 0
 x 9
 y 15
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 9
 y 16
-no_pass 0
 end
 arch biglake_center
 name sky
@@ -956,9 +956,9 @@ x 10
 end
 arch biglake_center
 name sky
+no_pass 0
 x 10
 y 1
-no_pass 0
 end
 arch cobblestones2
 x 10
@@ -1031,15 +1031,15 @@ x 11
 end
 arch biglake_center
 name sky
+no_pass 0
 x 11
 y 1
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 11
 y 2
-no_pass 0
 end
 arch cobblestones2
 x 11
@@ -1081,10 +1081,10 @@ arch sign
 name What's New in Pupland
 msg
 Fri 06.10.00:
-    o pupland-2.0.0 is released.
-    o lot's of bugfixes.
-    o tons of new features. 
-Please read what's new in each town 
+o pupland-2.0.0 is released.
+o lot's of bugfixes.
+o tons of new features.
+Please read what's new in each town
 and ask Poppy, the clever dog :)
 endmsg
 x 11
@@ -1112,15 +1112,15 @@ y 14
 end
 arch biglake_center
 name sky
+no_pass 0
 x 11
 y 15
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 11
 y 16
-no_pass 0
 end
 arch biglake_center
 name sky
@@ -1253,7 +1253,7 @@ arch grass
 x 13
 y 7
 end
-arch cobblestones2
+arch grass
 x 13
 y 8
 end
@@ -1345,9 +1345,9 @@ y 5
 end
 arch fog
 name cloud
+blocksview 0
 x 14
 y 5
-blocksview 0
 end
 arch grass
 x 14
@@ -1383,9 +1383,9 @@ y 12
 end
 arch fog
 name cloud
+blocksview 0
 x 14
 y 12
-blocksview 0
 end
 arch grass
 x 14
@@ -1658,9 +1658,9 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 17
 y 8
-no_pass 0
 end
 arch cobblestones2
 x 17
@@ -1747,9 +1747,9 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 18
 y 8
-no_pass 0
 end
 arch cobblestones2
 x 18
@@ -1836,15 +1836,15 @@ y 7
 end
 arch biglake_center
 name sky
+no_pass 0
 x 19
 y 8
-no_pass 0
 end
 arch biglake_center
 name sky
+no_pass 0
 x 19
 y 9
-no_pass 0
 end
 arch biglake_center
 name sky
@@ -1983,51 +1983,6 @@ sp 11
 x 1
 y 8
 end
-More
-arch dragon_exit_2
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 2
-y 8
-end
-More
-arch dragon_exit_3
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 3
-y 8
-end
-More
-arch dragon_exit_4
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 1
-y 9
-end
-More
-arch dragon_exit_5
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 2
-y 9
-end
-More
-arch dragon_exit_6
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 3
-y 9
-end
 arch palace
 slaying hall_of_fame
 hp 6
@@ -2035,132 +1990,6 @@ sp 26
 x 8
 y 7
 end
-More
-arch palace_2
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 9
-y 7
-end
-More
-arch palace_3
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 10
-y 7
-end
-More
-arch palace_4
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 11
-y 7
-end
-More
-arch palace_5
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 12
-y 7
-end
-More
-arch palace_6
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 8
-y 8
-end
-More
-arch palace_7
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 9
-y 8
-end
-More
-arch palace_8
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 10
-y 8
-end
-More
-arch palace_9
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 11
-y 8
-end
-More
-arch palace_10
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 12
-y 8
-end
-More
-arch palace_11
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 8
-y 9
-end
-More
-arch palace_12
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 9
-y 9
-end
-More
-arch palace_13
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 10
-y 9
-end
-More
-arch palace_14
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 11
-y 9
-end
-More
-arch palace_15
-name palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 12
-y 9
-end
 arch dragon_exit
 name To Scorn
 slaying /world/world_104_115
@@ -2169,51 +1998,6 @@ sp 24
 x 9
 y 1
 end
-More
-arch dragon_exit_2
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 10
-y 1
-end
-More
-arch dragon_exit_3
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 11
-y 1
-end
-More
-arch dragon_exit_4
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 9
-y 2
-end
-More
-arch dragon_exit_5
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 10
-y 2
-end
-More
-arch dragon_exit_6
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 11
-y 2
-end
 arch dragon_exit
 name To Red Island
 slaying rainbow/station
@@ -2222,77 +2006,7 @@ sp 3
 x 9
 y 15
 end
-More
-arch dragon_exit_2
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 10
-y 15
-end
-More
-arch dragon_exit_3
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 11
-y 15
-end
-More
-arch dragon_exit_4
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 9
-y 16
-end
-More
-arch dragon_exit_5
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 10
-y 16
-end
-More
-arch dragon_exit_6
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 11
-y 16
-end
 arch dragon_exit
 x 17
 y 8
 end
-More
-arch dragon_exit_2
-x 18
-y 8
-end
-More
-arch dragon_exit_3
-x 19
-y 8
-end
-More
-arch dragon_exit_4
-x 17
-y 9
-end
-More
-arch dragon_exit_5
-x 18
-y 9
-end
-More
-arch dragon_exit_6
-x 19
-y 9
-end