diff --git a/pup_land/lone_town/cave/b3 b/pup_land/lone_town/cave/b3
index 61039119c..bb3ab0c70 100755
--- a/pup_land/lone_town/cave/b3
+++ b/pup_land/lone_town/cave/b3
@@ -1,13 +1,13 @@
 arch map
-region lonetown
 name B3
+region lonetown
+width 18
+height 40
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Dec 18 19:05:18 1996
 endmsg
-x 18
-y 40
 end
 arch dungeon_floor
 end
@@ -389,7 +389,6 @@ end
 arch button_handle
 x 1
 y 23
-protected 11
 connected 11
 end
 arch dungeon_floor
@@ -455,7 +454,6 @@ end
 arch button_small
 x 1
 y 38
-protected 13
 connected 13
 end
 arch dungeon_floor
@@ -607,7 +605,6 @@ end
 arch ggate_closed
 x 2
 y 22
-protected 11
 connected 11
 end
 arch dungeon_floor
@@ -761,7 +758,6 @@ hp 7
 sp 16
 x 3
 y 3
-protected 2
 connected 2
 end
 arch dungeon_floor
@@ -1163,7 +1159,6 @@ arch grate_closed_1
 x 4
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -1431,7 +1426,6 @@ arch grate_closed_1
 x 5
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -1618,7 +1612,6 @@ end
 arch button_lever
 x 6
 y 6
-protected 1
 connected 1
 end
 arch pstone_1
@@ -1676,7 +1669,6 @@ end
 arch ggate_closed
 x 6
 y 14
-protected 1234
 connected 1234
 end
 arch dungeon_floor
@@ -1686,7 +1678,6 @@ end
 arch button_lever
 x 6
 y 15
-protected 1234
 connected 1234
 end
 arch dungeon_floor
@@ -1705,7 +1696,6 @@ arch grate_closed_1
 x 6
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -1900,7 +1890,6 @@ end
 arch grate_closed_2
 x 7
 y 9
-protected 1
 connected 1
 end
 arch dungeon_magic
@@ -1970,7 +1959,6 @@ arch grate_closed_1
 x 7
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -2183,7 +2171,6 @@ end
 arch grate_closed_2
 x 7
 y 37
-protected 14
 connected 14
 end
 arch dungeon_floor
@@ -2340,7 +2327,6 @@ arch grate_closed_1
 x 8
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -2442,7 +2428,6 @@ arch grate_closed_1
 x 8
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -2456,7 +2441,6 @@ end
 arch button_small
 x 8
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -2486,7 +2470,6 @@ end
 arch button_lever
 x 8
 y 36
-protected 14
 connected 14
 end
 arch generate_dragon
@@ -2495,11 +2478,11 @@ Con 100
 hp 30000
 maxhp 30000
 ac -100
-armour 100
 x 8
 y 36
 speed 0.000500
 level 100
+armour 100
 end
 arch dungeon_floor
 x 8
@@ -2519,11 +2502,11 @@ Con 100
 hp 30000
 maxhp 30000
 ac -100
-armour 100
 x 8
 y 38
 speed 0.000500
 level 100
+armour 100
 end
 arch dungeon_floor
 x 8
@@ -2683,7 +2666,6 @@ arch grate_closed_1
 x 9
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -2785,7 +2767,6 @@ arch grate_closed_1
 x 9
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -2799,7 +2780,6 @@ end
 arch button_small
 x 9
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -2867,7 +2847,6 @@ end
 arch button_plate
 x 10
 y 2
-protected 2
 connected 2
 end
 arch dungeon_floor
@@ -3006,7 +2985,6 @@ arch grate_closed_1
 x 10
 y 18
 speed 0.500000
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -3108,7 +3086,6 @@ arch grate_closed_1
 x 10
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3122,7 +3099,6 @@ end
 arch button_small
 x 10
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3460,7 +3436,6 @@ arch grate_closed_1
 x 11
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3474,7 +3449,6 @@ end
 arch button_small
 x 11
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3650,7 +3624,6 @@ end
 arch button_lever
 x 12
 y 18
-protected 10
 connected 10
 end
 arch dungeon_floor
@@ -3729,7 +3702,6 @@ arch grate_closed_1
 x 12
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3743,7 +3715,6 @@ end
 arch button_small
 x 12
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3949,7 +3920,6 @@ arch grate_closed_1
 x 13
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3959,7 +3929,6 @@ end
 arch button_small
 x 13
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -3997,7 +3966,6 @@ arch grate_open_2
 x 14
 y 1
 speed 0.500000
-protected 13
 value 1
 connected 13
 end
@@ -4153,7 +4121,6 @@ arch grate_closed_1
 x 14
 y 32
 speed 0.500000
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -4163,7 +4130,6 @@ end
 arch button_small
 x 14
 y 33
-protected 12
 connected 12
 end
 arch dungeon_floor
@@ -4203,7 +4169,6 @@ end
 arch button_plate
 x 15
 y 1
-protected 14
 connected 14
 end
 arch dungeon_floor
@@ -4548,7 +4513,7 @@ end
 arch scroll
 msg
 Say
-   "unusual"
+"unusual"
 to the reception guy.
 endmsg
 x 16
@@ -4639,8 +4604,8 @@ y 29
 level 0
 material 0
 randomitems none
-alive 0
 move_block 0
+alive 0
 blocksview 1
 pass_thru 0
 end
@@ -4675,7 +4640,6 @@ end
 arch button_lever
 x 16
 y 32
-protected 20
 connected 20
 end
 arch dungeon_floor
@@ -4686,7 +4650,6 @@ arch igate_closed_1
 x 16
 y 33
 speed 0.500000
-protected 20
 connected 20
 end
 arch dungeon_floor
@@ -4696,7 +4659,6 @@ end
 arch button_lever
 x 16
 y 34
-protected 20
 connected 20
 end
 arch rune_confusion
diff --git a/pup_land/lone_town/church b/pup_land/lone_town/church
index 27be3d657..2f98dc40e 100644
--- a/pup_land/lone_town/church
+++ b/pup_land/lone_town/church
@@ -1,13 +1,13 @@
 arch map
-region lonetown
 name townA_church
+region lonetown
+width 11
+height 20
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Fri Jan 26 23:40:23 1996
 endmsg
-x 11
-y 20
 end
 arch blocked
 end
@@ -619,7 +619,6 @@ endmsg
 food 100
 x 5
 y 13
-protected 99
 connected 99
 end
 arch woodfloor
diff --git a/pup_land/lone_town/dress3 b/pup_land/lone_town/dress3
index 15f4185bb..faad8c9ec 100644
--- a/pup_land/lone_town/dress3
+++ b/pup_land/lone_town/dress3
@@ -1787,7 +1787,6 @@ x 6
 y 27
 speed 0.500000
 connected 1
-protected 1
 end
 arch unholy_ground
 x 6
@@ -1802,7 +1801,6 @@ x 6
 y 28
 speed 0.500000
 connected 1
-protected 1
 end
 arch unholy_ground
 x 6
@@ -2174,7 +2172,6 @@ x 7
 y 27
 speed 0.500000
 connected 1
-protected 1
 end
 arch unholy_ground
 x 7
@@ -2196,7 +2193,6 @@ arch button_lever
 x 7
 y 28
 connected 1
-protected 1
 end
 arch unholy_ground
 x 7
@@ -2212,7 +2208,6 @@ y 29
 speed 0.500000
 value 1
 connected 1
-protected 1
 end
 arch unholy_ground
 x 7
@@ -2523,7 +2518,6 @@ x 8
 y 27
 speed 0.500000
 connected 1
-protected 1
 end
 arch unholy_ground
 x 8
@@ -2538,7 +2532,6 @@ x 8
 y 28
 speed 0.500000
 connected 1
-protected 1
 end
 arch unholy_ground
 x 8
diff --git a/pup_land/lone_town/gshop_ud b/pup_land/lone_town/gshop_ud
index b540a5edf..7423f9a1e 100644
--- a/pup_land/lone_town/gshop_ud
+++ b/pup_land/lone_town/gshop_ud
@@ -1,13 +1,14 @@
 arch map
-region lonetown
 name townA_gshop_ud
+difficulty 10
+region lonetown
+width 17
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Jan 31 19:12:31 1996
 endmsg
-x 17
-level 10
 end
 arch blocked
 end
@@ -1517,9 +1518,15 @@ maxhp 100
 ac 30
 x 14
 y 11
-immune 254
-alive 1
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
 move_block 0
+alive 1
 tear_down 1
 end
 arch dungeon_floor
diff --git a/pup_land/lone_town/guild_law b/pup_land/lone_town/guild_law
index ead5fe31c..554d6f92f 100644
--- a/pup_land/lone_town/guild_law
+++ b/pup_land/lone_town/guild_law
@@ -233,12 +233,32 @@ sp 0
 maxsp 0
 x 2
 y 7
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_turn_undead 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_godpower 100
+resist_holyword 100
+resist_blind 100
 randomitems none
 pick_up 0
 monster 0
 unaggressive 0
 can_cast_spell 0
-immune 8388607
 end
 arch afloor_right
 x 2
@@ -368,7 +388,6 @@ x 3
 y 11
 weight 1000
 connected 1
-protected 1
 end
 arch pstone_1
 x 3
@@ -441,7 +460,6 @@ endmsg
 x 4
 y 4
 connected 2
-protected 2
 end
 arch magic_ear
 name 1
@@ -452,7 +470,6 @@ endmsg
 x 4
 y 4
 connected 1
-protected 1
 end
 arch afloor_right
 x 4
@@ -518,7 +535,6 @@ x 4
 y 11
 speed 0.500000
 connected 5
-protected 5
 end
 arch afloor_right
 x 4
@@ -1125,7 +1141,6 @@ y 5
 speed 0.500000
 value 1
 connected 100
-protected 100
 end
 arch afloor_right
 x 11
@@ -1160,7 +1175,6 @@ x 11
 y 10
 speed 0.500000
 connected 100
-protected 100
 end
 arch afloor_right
 x 11
@@ -1228,7 +1242,6 @@ endmsg
 x 12
 y 5
 connected 100
-protected 100
 end
 arch afloor_right
 x 12
@@ -1274,7 +1287,6 @@ endmsg
 x 12
 y 10
 connected 100
-protected 100
 end
 arch afloor_right
 x 12
@@ -1347,7 +1359,6 @@ x 13
 y 5
 speed 0.500000
 connected 100
-protected 100
 end
 arch afloor_right
 x 13
@@ -1383,7 +1394,6 @@ y 10
 speed 0.500000
 value 1
 connected 100
-protected 100
 end
 arch afloor_right
 x 13
@@ -1932,7 +1942,6 @@ sp 7
 x 19
 speed 0.000000
 connected 4
-protected 4
 end
 arch guildmaster
 name James, the guildmaster
@@ -1945,12 +1954,32 @@ endmsg
 sp 0
 maxsp 0
 x 19
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_turn_undead 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_godpower 100
+resist_holyword 100
+resist_blind 100
 randomitems none
 pick_up 0
 monster 0
 unaggressive 0
 can_cast_spell 0
-immune 8388607
 end
 arch blocked
 x 19
@@ -1962,7 +1991,6 @@ x 19
 y 2
 weight 1000
 connected 4
-protected 4
 end
 arch blocked
 x 19
@@ -2011,7 +2039,6 @@ x 19
 y 13
 speed 1.000000
 connected 23
-protected 23
 end
 arch igate_closed_1
 name 22
@@ -2019,14 +2046,12 @@ x 19
 y 14
 speed 0.500000
 connected 22
-protected 22
 end
 arch gateTrg1
 name 2
 x 19
 y 15
 connected 2
-protected 2
 end
 arch lightningwall_1
 x 19
@@ -2133,7 +2158,6 @@ sp 4
 x 21
 speed 0.000000
 connected 4
-protected 4
 end
 arch card
 name Passport
@@ -2159,7 +2183,6 @@ endmsg
 x 21
 y 1
 connected 3
-protected 3
 end
 arch button_small
 name 3 - accept new member
@@ -2167,7 +2190,6 @@ x 21
 y 1
 weight 1000
 connected 3
-protected 3
 end
 arch creator
 name 23
@@ -2175,7 +2197,6 @@ other_arch small_shield
 x 21
 y 1
 connected 23
-protected 23
 end
 arch button_small
 name 5 - open gate
@@ -2183,7 +2204,6 @@ x 21
 y 2
 weight 100000
 connected 5
-protected 5
 end
 arch creator
 name 1
@@ -2191,7 +2211,6 @@ other_arch boulder
 x 21
 y 2
 connected 1
-protected 1
 end
 arch blocked
 x 21
@@ -2306,14 +2325,12 @@ name 22
 x 22
 weight 100000
 connected 22
-protected 22
 end
 arch creator
 name 21
 other_arch boulder
 x 22
 connected 21
-protected 21
 end
 arch blocked
 x 22
@@ -2340,7 +2357,6 @@ name 21
 x 22
 y 5
 connected 21
-protected 21
 end
 arch dungeon_floor
 x 22
@@ -2369,7 +2385,6 @@ x 22
 y 6
 speed 0.500000
 connected 31
-protected 31
 end
 arch dungeon_floor
 x 22
@@ -2391,7 +2406,6 @@ arch button_small
 x 22
 y 8
 connected 30
-protected 30
 end
 arch dungeon_floor
 x 22
@@ -2474,7 +2488,6 @@ arch button_plate
 x 23
 y 1
 connected 31
-protected 31
 end
 arch grate_open_1
 name 30
@@ -2483,7 +2496,6 @@ y 2
 speed 0.500000
 value 1
 connected 30
-protected 30
 end
 arch boulder
 x 23
diff --git a/pup_land/lone_town/mshop_ud b/pup_land/lone_town/mshop_ud
index 3de696982..c47525d9c 100644
--- a/pup_land/lone_town/mshop_ud
+++ b/pup_land/lone_town/mshop_ud
@@ -1,16 +1,16 @@
 arch map
 name townA_mshop_ud
 region lonetown
+shopitems *:100
+shopgreed 50.0000
+shopmin 10000
+width 15
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Jan 31 18:12:04 1996
 endmsg
-width 15
-height 16
-shopitems *:100
-shopmin 10000
-shopgreed 50.0
 end
 arch shop_empty
 end
@@ -213,87 +213,87 @@ x 2
 y 2
 end
 arch elvenboots
-identified 1
-unpaid 1
 x 2
 y 2
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
 y 3
 end
 arch levitationboots
-identified 1
-unpaid 1
 x 2
 y 3
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
 y 4
 end
 arch bracers_ac
-identified 1
-unpaid 1
 x 2
 y 4
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
 y 5
 end
 arch girdle_dam
-identified 1
-unpaid 1
 x 2
 y 5
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
 y 6
 end
 arch sandals
-identified 1
-unpaid 1
 x 2
 y 6
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
 y 7
 end
 arch dragon_mail
-unpaid 1
 x 2
 y 7
+unpaid 1
 end
 arch shop_empty
 x 2
 y 8
 end
 arch dragon_shield
-unpaid 1
 x 2
 y 8
+unpaid 1
 end
 arch shop_empty
 x 2
 y 9
 end
 arch eyeshield
-unpaid 1
 x 2
 y 9
+unpaid 1
 end
 arch shop_empty
 x 2
 y 10
 end
 arch ring_nodrain
-identified 1
-unpaid 1
 x 2
 y 10
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 2
@@ -457,10 +457,9 @@ end
 arch altar
 slaying diamond of exceptional beauty
 food 100
-protected 1
-connected 1
 x 3
 y 14
+connected 1
 end
 arch cobblestones2
 x 3
@@ -485,90 +484,90 @@ x 4
 y 2
 end
 arch elven_bow
-identified 1
-unpaid 1
 x 4
 y 2
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 3
 end
 arch bonecrusher
-identified 1
-unpaid 1
 x 4
 y 3
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 4
 end
 arch firebrand
-identified 1
-unpaid 1
 x 4
 y 4
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 5
 end
 arch frostbrand
-identified 1
-unpaid 1
 x 4
 y 5
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 6
 end
 arch excalibur
-identified 1
-unpaid 1
 x 4
 y 6
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 7
 end
 arch dragonslayer
-identified 1
-unpaid 1
 x 4
 y 7
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 8
 end
 arch defender
-identified 1
-unpaid 1
 x 4
 y 8
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 9
 end
 arch amulet_lifesave
-identified 1
-unpaid 1
 x 4
 y 9
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
 y 10
 end
 arch ring
-identified 1
-unpaid 1
 x 4
 y 10
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 4
@@ -599,10 +598,9 @@ x 4
 y 14
 end
 arch gate_closed_2
-protected 1
-connected 1
 x 4
 y 14
+connected 1
 end
 arch cobblestones2
 x 4
@@ -709,36 +707,36 @@ x 6
 y 2
 end
 arch scroll_oratory
-unpaid 1
 x 6
 y 2
+unpaid 1
 end
 arch shop_empty
 x 6
 y 3
 end
 arch scroll_stealing
-unpaid 1
 x 6
 y 3
+unpaid 1
 end
 arch shop_empty
 x 6
 y 4
 end
 arch scroll_singing
-unpaid 1
 x 6
 y 4
+unpaid 1
 end
 arch shop_empty
 x 6
 y 5
 end
 arch scroll_literacy
-unpaid 1
 x 6
 y 5
+unpaid 1
 end
 arch shop_empty
 x 6
@@ -749,45 +747,45 @@ x 6
 y 7
 end
 arch scroll_punching
-unpaid 1
 x 6
 y 7
+unpaid 1
 end
 arch shop_empty
 x 6
 y 8
 end
 arch scroll_one_handed_weapons
-unpaid 1
 x 6
 y 8
+unpaid 1
 end
 arch shop_empty
 x 6
 y 9
 end
 arch scroll_karate
-unpaid 1
 x 6
 y 9
+unpaid 1
 end
 arch shop_empty
 x 6
 y 10
 end
 arch scroll_jumping
-unpaid 1
 x 6
 y 10
+unpaid 1
 end
 arch shop_empty
 x 6
 y 11
 end
 arch scroll_missile_weap
-unpaid 1
 x 6
 y 11
+unpaid 1
 end
 arch shop_empty
 x 6
@@ -928,9 +926,9 @@ x 7
 y 14
 end
 arch scroll_two_handed_weapons
-unpaid 1
 x 7
 y 14
+unpaid 1
 end
 arch shop_empty
 x 7
@@ -955,91 +953,91 @@ x 8
 y 2
 end
 arch scroll_bargaining
-unpaid 1
 x 8
 y 2
+unpaid 1
 end
 arch shop_empty
 x 8
 y 3
 end
 arch scroll_woodsman
-unpaid 1
 x 8
 y 3
+unpaid 1
 end
 arch shop_empty
 x 8
 y 4
 end
 arch scroll_thaumaturgy
-unpaid 1
 x 8
 y 4
+unpaid 1
 end
 arch shop_empty
 x 8
 y 5
 end
 arch scroll_jewelry
-unpaid 1
 x 8
 y 5
+unpaid 1
 end
 arch shop_empty
 x 8
 y 6
 end
 arch scroll_smithing
-unpaid 1
 x 8
 y 6
+unpaid 1
 end
 arch shop_empty
 x 8
 y 7
 end
 arch scroll_bowyer
-unpaid 1
 x 8
 y 7
+unpaid 1
 end
 arch shop_empty
 x 8
 y 8
 end
 arch holy_symbol
-identified 1
-unpaid 1
 x 8
 y 8
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 8
 y 9
 end
 arch scroll_pyromancy
-unpaid 1
 x 8
 y 9
+unpaid 1
 end
 arch shop_empty
 x 8
 y 10
 end
 arch scroll_evocation
-unpaid 1
 x 8
 y 10
+unpaid 1
 end
 arch shop_empty
 x 8
 y 11
 end
 arch scroll_sorcery
-unpaid 1
 x 8
 y 11
+unpaid 1
 end
 arch shop_empty
 x 8
@@ -1146,109 +1144,109 @@ x 10
 y 2
 end
 arch scroll_alchemy
-unpaid 1
 x 10
 y 2
+unpaid 1
 end
 arch shop_empty
 x 10
 y 3
 end
 arch scroll_summoning
-unpaid 1
 x 10
 y 3
+unpaid 1
 end
 arch shop_empty
 x 10
 y 4
 end
 arch lockpicks
-identified 1
-unpaid 1
 x 10
 y 4
+unpaid 1
+identified 1
 end
 arch shop_empty
 x 10
 y 5
 end
 arch scroll_disarm_traps
-unpaid 1
 x 10
 y 5
+unpaid 1
 end
 arch shop_empty
 x 10
 y 6
 end
 arch scroll_set_traps
-unpaid 1
 x 10
 y 6
+unpaid 1
 end
 arch shop_empty
 x 10
 y 7
 end
 arch scroll_hiding
-unpaid 1
 x 10
 y 7
+unpaid 1
 end
 arch shop_empty
 x 10
 y 8
 end
 arch scroll_climbing
-unpaid 1
 x 10
 y 8
+unpaid 1
 end
 arch shop_empty
 x 10
 y 9
 end
 arch scroll_sense_mag
-unpaid 1
 x 10
 y 9
+unpaid 1
 end
 arch shop_empty
 x 10
 y 10
 end
 arch scroll_sense_curse
-unpaid 1
 x 10
 y 10
+unpaid 1
 end
 arch shop_empty
 x 10
 y 11
 end
 arch scroll_use_magic_item
-unpaid 1
 x 10
 y 11
+unpaid 1
 end
 arch shop_empty
 x 10
 y 12
 end
 arch scroll_find_traps
-unpaid 1
 x 10
 y 12
+unpaid 1
 end
 arch shop_empty
 x 10
 y 13
 end
 arch scroll_praying
-unpaid 1
 x 10
 y 13
+unpaid 1
 end
 arch shop_empty
 x 10
@@ -1395,108 +1393,108 @@ x 12
 y 2
 end
 arch prepare_weapon
-unpaid 1
 x 12
 y 2
+unpaid 1
 end
 arch shop_empty
 x 12
 y 3
 end
 arch improve_wis
-unpaid 1
 x 12
 y 3
+unpaid 1
 end
 arch shop_empty
 x 12
 y 4
 end
 arch improve_weight
-unpaid 1
 x 12
 y 4
+unpaid 1
 end
 arch shop_empty
 x 12
 y 5
 end
 arch improve_str
-unpaid 1
 x 12
 y 5
+unpaid 1
 end
 arch shop_empty
 x 12
 y 6
 end
 arch improve_pow
-unpaid 1
 x 12
 y 6
+unpaid 1
 end
 arch shop_empty
 x 12
 y 7
 end
 arch improve_int
-unpaid 1
 x 12
 y 7
+unpaid 1
 end
 arch shop_empty
 x 12
 y 8
 end
 arch improve_enchantment
-unpaid 1
 x 12
 y 8
+unpaid 1
 end
 arch shop_empty
 x 12
 y 9
 end
 arch improve_dex
-unpaid 1
 x 12
 y 9
+unpaid 1
 end
 arch shop_empty
 x 12
 y 10
 end
 arch improve_damage
-unpaid 1
 x 12
 y 10
+unpaid 1
 end
 arch shop_empty
 x 12
 y 11
 end
 arch improve_con
-unpaid 1
 x 12
 y 11
+unpaid 1
 end
 arch shop_empty
 x 12
 y 12
 end
 arch improve_cha
-unpaid 1
 x 12
 y 12
+unpaid 1
 end
 arch shop_empty
 x 12
 y 13
 end
 arch ench_armour
-unpaid 1
 x 12
 y 13
+unpaid 1
 end
 arch shop_empty
 x 12
diff --git a/pup_land/lone_town/pupuly b/pup_land/lone_town/pupuly
index e615715c1..3c00ebbef 100644
--- a/pup_land/lone_town/pupuly
+++ b/pup_land/lone_town/pupuly
@@ -4642,7 +4642,6 @@ endmsg
 x 21
 y 23
 connected 1230
-protected 1230
 end
 arch dungeon_floor
 x 21
@@ -5689,7 +5688,6 @@ sp 24
 x 25
 y 6
 connected 5
-protected 5
 end
 arch key2
 name Guard Room Key
@@ -5756,7 +5754,6 @@ arch ggate_closed
 x 25
 y 9
 connected 999
-protected 999
 end
 arch afloor_right
 x 25
@@ -5888,7 +5885,6 @@ sp 6
 x 25
 y 25
 connected 5
-protected 5
 end
 arch dungeon_floor
 x 25
@@ -6058,7 +6054,6 @@ y 10
 connected 10
 walk_on 0
 fly_on 0
-protected 10
 end
 arch afloor_right
 x 26
@@ -6072,7 +6067,6 @@ arch button_lever
 x 26
 y 10
 connected 11
-protected 11
 end
 arch afloor_right
 x 26
@@ -8647,7 +8641,6 @@ y 18
 speed 2.000000
 value 1
 connected 11
-protected 11
 end
 arch scroll
 x 36
@@ -8659,7 +8652,6 @@ x 36
 y 19
 speed 0.500000
 connected 5
-protected 5
 end
 arch blocked
 x 36
@@ -8841,7 +8833,6 @@ x 37
 y 18
 weight 10
 connected 10
-protected 10
 end
 arch spikes_closed
 name 11
@@ -8852,7 +8843,6 @@ x 37
 y 18
 speed 2.000000
 connected 11
-protected 11
 end
 arch igate_closed_1
 name 5
@@ -8860,7 +8850,6 @@ x 37
 y 19
 speed 0.500000
 connected 5
-protected 5
 end
 arch blocked
 x 37
@@ -10096,7 +10085,6 @@ sp 24
 x 44
 y 7
 connected 5
-protected 5
 end
 arch wraith
 x 44
@@ -10856,7 +10844,6 @@ arch gate_closed_2
 x 48
 y 4
 connected 5
-protected 5
 end
 arch woodfloor
 x 48
@@ -11053,7 +11040,6 @@ name escape pits
 x 49
 y 5
 connected 5
-protected 5
 end
 arch corpse
 name servant's corpse
diff --git a/pup_land/lone_town/thief_market b/pup_land/lone_town/thief_market
index 521f4e581..bf77ddf35 100644
--- a/pup_land/lone_town/thief_market
+++ b/pup_land/lone_town/thief_market
@@ -1,12 +1,13 @@
 arch map
-region lonetown
 name thief_market
+region lonetown
+width 16
+height 25
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Mar 14 02:50:38 1996
 endmsg
-y 25
 end
 arch blocked
 y 3
@@ -746,7 +747,6 @@ Click.
 endmsg
 x 6
 y 12
-protected 1
 connected 1
 end
 arch woodfloor
@@ -761,7 +761,6 @@ arch gate_closed_1
 x 6
 y 13
 speed 0.500000
-protected 1
 connected 1
 end
 arch woodfloor
@@ -879,8 +878,8 @@ hp 100
 x 7
 y 12
 type 0
-monster 1
 move_type walk
+monster 1
 friendly 1
 end
 arch woodfloor
@@ -1039,8 +1038,8 @@ end
 arch door_look_1
 x 8
 y 19
-alive 0
 move_block 0
+alive 0
 end
 arch shop_gems
 x 8
@@ -1137,8 +1136,8 @@ end
 arch door_look_1
 x 9
 y 19
-alive 0
 move_block 0
+alive 0
 end
 arch shop_gems
 x 9
@@ -1235,8 +1234,8 @@ end
 arch door_look_1
 x 10
 y 19
-alive 0
 move_block 0
+alive 0
 end
 arch shop_gems
 x 10
diff --git a/pup_land/lone_town/training b/pup_land/lone_town/training
index bc47006cb..10eebdbde 100644
--- a/pup_land/lone_town/training
+++ b/pup_land/lone_town/training
@@ -849,7 +849,6 @@ arch trigger
 x 5
 y 16
 connected 11
-protected 11
 end
 arch kobold
 x 5
@@ -1068,7 +1067,6 @@ arch gateTrg1
 x 6
 y 15
 connected 11
-protected 11
 end
 arch pstone_1
 x 6
@@ -1244,7 +1242,6 @@ arch trigger
 x 7
 y 14
 connected 11
-protected 11
 end
 arch cobblestones2
 x 7
@@ -2193,7 +2190,6 @@ arch trigger
 x 12
 y 14
 connected 2
-protected 2
 end
 arch cobblestones2
 x 12
@@ -2299,7 +2295,6 @@ arch trigger
 x 13
 y 2
 connected 3
-protected 3
 end
 arch cobblestones2
 x 13
@@ -2369,7 +2364,6 @@ endmsg
 x 13
 y 15
 connected 2
-protected 2
 end
 arch cobblestones2
 x 13
@@ -2380,7 +2374,6 @@ sp 1
 x 13
 y 15
 connected 2
-protected 2
 end
 arch small_stones
 x 13
@@ -2478,7 +2471,6 @@ arch gateTrg2
 x 14
 y 1
 connected 3
-protected 3
 end
 arch cobblestones2
 x 14
@@ -2618,7 +2610,6 @@ x 14
 y 18
 value 1
 connected 200
-protected 200
 end
 arch kobold
 x 14
@@ -2700,7 +2691,6 @@ arch trigger
 x 15
 y 2
 connected 3
-protected 3
 end
 arch cobblestones2
 x 15
@@ -2838,7 +2828,6 @@ arch gate_open_2
 x 15
 y 18
 connected 200
-protected 200
 end
 arch kobold
 x 15
@@ -3079,7 +3068,6 @@ arch grate_closed_2
 x 16
 y 18
 connected 100
-protected 100
 end
 arch pstone_1
 x 16
@@ -3283,7 +3271,6 @@ arch button_small
 x 17
 y 18
 connected 100
-protected 100
 end
 arch pstone_1
 x 17
diff --git a/pup_land/lone_town/training2 b/pup_land/lone_town/training2
index 711665a42..065d21d9c 100644
--- a/pup_land/lone_town/training2
+++ b/pup_land/lone_town/training2
@@ -1,14 +1,14 @@
 arch map
-region lonetown
 name training2
+difficulty 2
+region lonetown
+width 32
+height 10
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jan 29 20:30:19 1996
 endmsg
-x 32
-y 10
-level 2
 end
 arch cobblestones2
 end
@@ -212,7 +212,6 @@ end
 arch trigger
 x 2
 y 5
-protected 1
 connected 1
 end
 arch dungeon_magic
@@ -284,7 +283,6 @@ end
 arch gateTrg2
 x 3
 y 4
-protected 1
 connected 1
 end
 arch pstone_1
@@ -368,7 +366,6 @@ end
 arch trigger
 x 4
 y 3
-protected 1
 connected 1
 end
 arch orc
@@ -2931,6 +2928,29 @@ arch pstone_1
 x 28
 y 4
 end
+arch demon_lord
+name Demon Lord?
+Con 1
+hp 35
+maxhp 50
+exp 500
+dam 3
+wc -1
+ac 10
+x 28
+y 4
+level 5
+attacktype 1
+value 1000
+carrying 2200
+identified 1
+can_cast_spell 0
+arch gloves
+nrof 4
+end
+arch potion_heal
+end
+end
 arch pstone_1
 x 28
 y 5
@@ -3125,26 +3145,3 @@ arch rough_wall_2_2_4
 x 31
 y 9
 end
-arch demon_lord
-name Demon Lord?
-Con 1
-hp 35
-maxhp 50
-exp 500
-dam 3
-wc -1
-ac 10
-x 28
-y 4
-level 5
-attacktype 1
-value 1000
-carrying 2200
-identified 1
-can_cast_spell 0
-arch gloves
-nrof 4
-end
-arch potion_heal
-end
-end