diff --git a/brest/brest.inn b/brest/brest.inn
index 32c63c3b3..ee6b8a2c1 100644
--- a/brest/brest.inn
+++ b/brest/brest.inn
@@ -4495,7 +4495,6 @@ A strong wine.
 endmsg
 x 24
 y 14
-unpaid 1
 no_pick 1
 end
 arch woodfloor
diff --git a/brest/brest.scrolls b/brest/brest.scrolls
index 3578b3bd0..c592143dd 100644
--- a/brest/brest.scrolls
+++ b/brest/brest.scrolls
@@ -1,19 +1,19 @@
 arch map
 name brest.scrolls
 region brest
+shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
+shopgreed 0.95
+shopmin 5
+shopmax 150000
+shoprace human
+width 20
+height 40
 msg
 Creator: Gene Alexander
 Editor: CF Java Map Editor
 Date:    5/23/2005
 endmsg
-width 20
-height 40
 outdoor 1
-shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
-shopmin 5
-shopmax 150000
-shoprace human
-shopgreed 0.95
 tile_path_2 brest.scrolls.right
 end
 arch brush
@@ -32,9 +32,9 @@ y 2
 end
 arch lamppost
 name Lighted fence post
+y 2
 glow_radius 5
 no_pass 1
-y 2
 end
 arch brush
 y 3
@@ -134,9 +134,9 @@ y 18
 end
 arch lamppost
 name Lighted fence post
+y 18
 glow_radius 5
 no_pass 1
-y 18
 end
 arch brush
 y 19
@@ -242,9 +242,9 @@ y 35
 end
 arch lamppost
 name Lighted fence post
+y 35
 glow_radius 5
 no_pass 1
-y 35
 end
 arch brush
 y 36
@@ -404,33 +404,33 @@ x 1
 y 29
 end
 arch tree
-no_pass 1
-no_magic 1
-damned 1
 x 1
 y 29
+no_pass 1
+no_magic 1
+damned 1
 end
 arch brush
 x 1
 y 30
 end
 arch tree
+x 1
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 1
-y 30
 end
 arch brush
 x 1
 y 31
 end
 arch tree
+x 1
+y 31
 no_pass 1
 no_magic 1
 damned 1
-x 1
-y 31
 end
 arch brush
 x 1
@@ -617,33 +617,33 @@ x 2
 y 29
 end
 arch tree
-no_pass 1
-no_magic 1
-damned 1
 x 2
 y 29
+no_pass 1
+no_magic 1
+damned 1
 end
 arch brush
 x 2
 y 30
 end
 arch tree
+x 2
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 2
-y 30
 end
 arch brush
 x 2
 y 31
 end
 arch tree
+x 2
+y 31
 no_pass 1
 no_magic 1
 damned 1
-x 2
-y 31
 end
 arch brush
 x 2
@@ -787,10 +787,10 @@ y 18
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 3
 y 18
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 3
@@ -869,11 +869,11 @@ x 3
 y 30
 end
 arch tree
+x 3
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 3
-y 30
 end
 arch brush
 x 3
@@ -1176,10 +1176,10 @@ y 39
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 4
 y 39
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 5
@@ -1419,10 +1419,10 @@ y 2
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 2
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_2
 x 6
@@ -1433,40 +1433,40 @@ x 6
 y 3
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 3
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 4
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 4
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 5
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 5
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 6
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 6
+no_magic 1
+damned 1
 end
 arch brush
 x 6
@@ -1474,10 +1474,10 @@ y 7
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 7
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_1
 x 6
@@ -1633,10 +1633,10 @@ y 35
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 35
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 6
@@ -1674,10 +1674,10 @@ x 7
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 7
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 7
@@ -1716,10 +1716,10 @@ x 7
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 7
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 7
@@ -1899,10 +1899,10 @@ x 8
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 8
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 8
@@ -1941,10 +1941,10 @@ x 8
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 8
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 8
@@ -2122,10 +2122,10 @@ x 9
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 9
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 9
@@ -2164,10 +2164,10 @@ x 9
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 9
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 9
@@ -2311,10 +2311,10 @@ x 9
 y 32
 end
 arch swall_2_2_2
-no_magic 1
-damned 1
 x 9
 y 32
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 9
@@ -2325,10 +2325,10 @@ x 9
 y 33
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 9
 y 33
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 9
@@ -2339,10 +2339,10 @@ x 9
 y 34
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 9
 y 34
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 9
@@ -2396,10 +2396,10 @@ x 10
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 10
@@ -2438,10 +2438,10 @@ x 10
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 10
@@ -2597,10 +2597,10 @@ x 10
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 10
@@ -2670,10 +2670,10 @@ x 11
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 11
 y 2
+no_magic 1
+damned 1
 end
 arch brush
 x 11
@@ -2688,10 +2688,10 @@ x 11
 y 5
 end
 arch button_small
-invisible 1
-connected 3
 x 11
 y 6
+invisible 1
+connected 3
 end
 arch brush
 x 11
@@ -2706,17 +2706,17 @@ x 11
 y 7
 end
 arch ggate_closed
+x 11
+y 7
 connected 3
 no_magic 1
 damned 1
-x 11
-y 7
 end
 arch button_small
-invisible 1
-connected 3
 x 11
 y 8
+invisible 1
+connected 3
 end
 arch brush
 x 11
@@ -2875,10 +2875,10 @@ x 11
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 11
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 11
@@ -2889,10 +2889,10 @@ x 11
 y 33
 end
 arch button_small
-invisible 1
-connected 1
 x 11
 y 34
+invisible 1
+connected 1
 end
 arch stonefloor2
 x 11
@@ -2903,15 +2903,15 @@ x 11
 y 35
 end
 arch mdoor_closed_2
-connected 1
 x 11
 y 35
+connected 1
 end
 arch button_small
-invisible 1
-connected 1
 x 11
 y 36
+invisible 1
+connected 1
 end
 arch footpath_3_2
 x 11
@@ -2949,10 +2949,10 @@ x 12
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 2
+no_magic 1
+damned 1
 end
 arch brush
 x 12
@@ -2972,10 +2972,10 @@ y 6
 end
 arch wagon
 name Zorn's wagon
+slaying /world/world_107_123
 msg
 The spirit of Zorn expels you ...
 endmsg
-slaying /world/world_107_123
 hp 38
 sp 17
 x 12
@@ -2986,10 +2986,10 @@ x 12
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 12
@@ -3152,20 +3152,20 @@ x 12
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 12
 y 33
 end
 arch button_small
-invisible 1
-connected 1
 x 12
 y 34
+invisible 1
+connected 1
 end
 arch stonefloor2
 x 12
@@ -3176,15 +3176,15 @@ x 12
 y 35
 end
 arch mdoor_closed_2
-connected 1
 x 12
 y 35
+connected 1
 end
 arch button_small
-invisible 1
-connected 1
 x 12
 y 36
+invisible 1
+connected 1
 end
 arch footpath_3_4
 x 12
@@ -3230,10 +3230,10 @@ x 13
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 13
@@ -3272,10 +3272,10 @@ x 13
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 13
@@ -3435,10 +3435,10 @@ x 13
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 13
@@ -3500,10 +3500,10 @@ x 14
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 14
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 14
@@ -3542,10 +3542,10 @@ x 14
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 14
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 14
@@ -3693,10 +3693,10 @@ x 14
 y 32
 end
 arch swall_2_2_3
-no_magic 1
-damned 1
 x 14
 y 32
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 14
@@ -3707,10 +3707,10 @@ x 14
 y 33
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 14
 y 33
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 14
@@ -3721,10 +3721,10 @@ x 14
 y 34
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 14
 y 34
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 14
@@ -3778,10 +3778,10 @@ x 15
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 15
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 15
@@ -3820,10 +3820,10 @@ x 15
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 15
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 15
@@ -4005,10 +4005,10 @@ x 16
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 16
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 16
@@ -4055,10 +4055,10 @@ x 16
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 16
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 16
@@ -4243,10 +4243,10 @@ y 2
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 17
 y 2
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_3
 x 17
@@ -4257,40 +4257,40 @@ x 17
 y 3
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 3
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 4
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 4
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 5
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 5
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 6
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 6
+no_magic 1
+damned 1
 end
 arch brush
 x 17
@@ -4298,10 +4298,10 @@ y 7
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 17
 y 7
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_4
 x 17
@@ -4575,17 +4575,17 @@ x 18
 y 15
 end
 arch swall_1_4_half
-no_magic 1
-damned 1
 x 18
 y 15
+no_magic 1
+damned 1
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 18
 y 15
+glow_radius 5
+no_pass 1
 end
 arch stonefloor2
 x 18
@@ -4829,10 +4829,10 @@ x 19
 y 15
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 19
 y 15
+no_magic 1
+damned 1
 end
 arch footpath_1_4
 x 19
@@ -5032,89 +5032,93 @@ y 39
 end
 arch unicorn
 name Zorn's pet
-glow_radius 3
-level 150
-exp 5000
-speed 1.0
-attacktype 1048849
-dam 50
-wc -50
+Con 25
+Pow 5
 hp 2000
 maxhp 2000
-ac -50
-Con 25
-reflect_missile 1
-hitback 1
-reflect_spell 1
 sp 250
 maxsp 500
-Pow 5
-path_attuned 1060
-can_see_in_dark 1
-can_use_skill 1
+exp 5000
+dam 50
+wc -50
+ac -50
 x 1
 y 3
-arch spell_paralyze
-end
-arch spell_fear
-end
-arch spell_frostbolt
-end
-arch spell_large_icestorm
-end
-arch spell_regeneration
-arch skill_praying
-skill
+speed 1.0
+level 150
+attacktype 1048849
+path_attuned 1060
+glow_radius 3
+hitback 1
+reflect_missile 1
+reflect_spell 1
 can_use_skill 1
-arch experience_wis
-end
-end
-end
+can_see_in_dark 1
 arch key2
 name Zorn's pet pelt
-face sheepskin.111
 name_pl Zorn's pet pelts
 slaying zorn_pet_pelt
+face sheepskin.111
 material 32
 end
+arch abil_large_icestorm
+end
+arch abil_icestorm
+end
+arch abil_fear
+end
+arch abil_slow
+end
+arch abil_frostbolt
+end
+arch spell_major_healing
+end
+arch spell_bullet_swarm
+end
+arch skill_evocation
+end
+arch skill_praying
+end
+arch skill_meditation
+end
 end
 arch cyclops
 name Orville
 title hyper cyclops
-level 150
-speed 0.5
 dam 80
 wc -25
 ac -30
-can_see_in_dark 1
+x 7
+y 26
+speed 0.5
+level 150
 resist_confusion 50
 resist_weaponmagic 50
 resist_ghosthit 50
+resist_turn_undead 50
 resist_fear 50
 resist_deplete 50
-resist_turn_undead 50
 resist_death 50
 resist_blind 50
-x 7
-y 26
+can_see_in_dark 1
 end
 arch cyclops
 name Wilbur
 title hyper cyclops
-level 150
-speed 0.5
 dam 80
 wc -25
 ac -30
-can_see_in_dark 1
+x 15
+y 26
+speed 0.5
+level 150
 resist_confusion 50
 resist_weaponmagic 50
 resist_ghosthit 50
+resist_turn_undead 50
 resist_fear 50
 resist_deplete 50
-resist_turn_undead 50
 resist_death 50
 resist_blind 50
-x 15
-y 26
+can_see_in_dark 1
 end
diff --git a/brest/taverns/brest.seaside.tavern b/brest/taverns/brest.seaside.tavern
index 499eeb60d..58120bb5c 100644
--- a/brest/taverns/brest.seaside.tavern
+++ b/brest/taverns/brest.seaside.tavern
@@ -3,6 +3,8 @@ name Brest Seaside Tavern
 region brest
 width 30
 height 15
+enter_x 16
+enter_y 13
 msg
 Creator: Gene Alexander
 Date:    8/19/2006
@@ -24,38 +26,65 @@ arch small_stones
 y 3
 elevation 25
 end
+arch swall_2_2_2
+y 3
+end
 arch small_stones
 y 4
 elevation 25
 end
+arch swall_2_1_1
+y 4
+end
 arch small_stones
 y 5
 elevation 25
 end
+arch swall_2_1_1
+y 5
+end
 arch small_stones
 y 6
 elevation 25
 end
+arch swall_2_1_1
+y 6
+end
 arch small_stones
 y 7
 elevation 25
 end
+arch swall_2_1_1
+y 7
+end
 arch small_stones
 y 8
 elevation 25
 end
+arch swall_2_1_1
+y 8
+end
 arch small_stones
 y 9
 elevation 25
 end
+arch swall_2_1_1
+y 9
+end
 arch small_stones
 y 10
 elevation 25
 end
+arch swall_2_1_1
+y 10
+end
 arch small_stones
 y 11
 elevation 25
 end
+arch swall_2_2_1
+y 11
+end
 arch small_stones
 y 12
 elevation 25
@@ -90,6 +119,10 @@ x 1
 y 3
 elevation 25
 end
+arch ggate_open
+x 1
+y 3
+end
 arch small_stones
 x 1
 y 4
@@ -130,6 +163,10 @@ x 1
 y 11
 elevation 25
 end
+arch ggate_open
+x 1
+y 11
+end
 arch small_stones
 x 1
 y 12
@@ -160,9 +197,10 @@ y 2
 elevation 25
 end
 arch dog
+name Lassie
 x 2
 y 2
-unaggressive 1
+friendly 1
 sleep 0
 end
 arch small_stones
@@ -170,6 +208,10 @@ x 2
 y 3
 elevation 25
 end
+arch swall_2_1_2
+x 2
+y 3
+end
 arch small_stones
 x 2
 y 4
@@ -185,11 +227,21 @@ x 2
 y 6
 elevation 25
 end
+arch hovels
+name dog house
+x 2
+y 6
+end
 arch small_stones
 x 2
 y 7
 elevation 25
 end
+arch hovels
+name dog house
+x 2
+y 7
+end
 arch small_stones
 x 2
 y 8
@@ -210,6 +262,10 @@ x 2
 y 11
 elevation 25
 end
+arch swall_2_1_2
+x 2
+y 11
+end
 arch small_stones
 x 2
 y 12
@@ -235,9 +291,10 @@ y 1
 elevation 25
 end
 arch dog
+name Rin Tin Tin
 x 3
 y 1
-unaggressive 1
+friendly 1
 sleep 0
 end
 arch small_stones
@@ -245,6 +302,10 @@ x 3
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 3
+y 3
+end
 arch dirtfloor
 x 3
 y 3
@@ -253,6 +314,14 @@ arch woodwall_2_2_2
 x 3
 y 3
 end
+arch swall_1_3_half
+x 3
+y 3
+end
+arch dungeon_magic
+x 3
+y 4
+end
 arch dirtfloor
 x 3
 y 4
@@ -261,6 +330,10 @@ arch woodwall_win1
 x 3
 y 4
 end
+arch dungeon_magic
+x 3
+y 5
+end
 arch dirtfloor
 x 3
 y 5
@@ -269,6 +342,10 @@ arch woodwall_win1
 x 3
 y 5
 end
+arch dungeon_magic
+x 3
+y 6
+end
 arch dirtfloor
 x 3
 y 6
@@ -277,6 +354,10 @@ arch woodwall_win1
 x 3
 y 6
 end
+arch dungeon_magic
+x 3
+y 7
+end
 arch dirtfloor
 x 3
 y 7
@@ -285,6 +366,10 @@ arch woodwall_win1
 x 3
 y 7
 end
+arch dungeon_magic
+x 3
+y 8
+end
 arch dirtfloor
 x 3
 y 8
@@ -293,6 +378,10 @@ arch woodwall_win1
 x 3
 y 8
 end
+arch dungeon_magic
+x 3
+y 9
+end
 arch dirtfloor
 x 3
 y 9
@@ -301,6 +390,10 @@ arch woodwall_win1
 x 3
 y 9
 end
+arch dungeon_magic
+x 3
+y 10
+end
 arch dirtfloor
 x 3
 y 10
@@ -309,6 +402,10 @@ arch woodwall_win1
 x 3
 y 10
 end
+arch dungeon_magic
+x 3
+y 11
+end
 arch dirtfloor
 x 3
 y 11
@@ -317,6 +414,10 @@ arch woodwall_2_2_1
 x 3
 y 11
 end
+arch swall_1_3_half
+x 3
+y 11
+end
 arch small_stones
 x 3
 y 12
@@ -341,11 +442,22 @@ x 4
 y 1
 elevation 25
 end
+arch invis_exit
+slaying /world/world_107_123
+hp 46
+sp 45
+x 4
+y 2
+end
 arch small_stones
 x 4
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 4
+y 3
+end
 arch dirtfloor
 x 4
 y 3
@@ -358,10 +470,14 @@ arch dirtfloor
 x 4
 y 4
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 4
 y 4
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 4
@@ -435,10 +551,18 @@ arch dirtfloor
 x 4
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 4
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 4
+y 11
 end
 arch dirtfloor
 x 4
@@ -472,17 +596,17 @@ x 5
 y 1
 elevation 25
 end
-arch small_stones
-x 5
-y 2
-elevation 25
-end
 arch invis_exit
 slaying /world/world_107_123
 hp 46
 sp 45
 x 5
-y 3
+y 2
+end
+arch small_stones
+x 5
+y 2
+elevation 25
 end
 arch dirtfloor
 x 5
@@ -628,6 +752,10 @@ y 10
 randomitems guard_h
 stand_still 0
 end
+arch dungeon_magic
+x 5
+y 11
+end
 arch dirtfloor
 x 5
 y 11
@@ -660,17 +788,17 @@ x 6
 y 1
 elevation 25
 end
-arch small_stones
-x 6
-y 2
-elevation 25
-end
 arch invis_exit
 slaying /world/world_107_123
 hp 46
 sp 45
 x 6
-y 3
+y 2
+end
+arch small_stones
+x 6
+y 2
+elevation 25
 end
 arch dirtfloor
 x 6
@@ -752,6 +880,10 @@ arch dirtfloor
 x 6
 y 10
 end
+arch dungeon_magic
+x 6
+y 11
+end
 arch dirtfloor
 x 6
 y 11
@@ -784,11 +916,22 @@ x 7
 y 1
 elevation 25
 end
+arch invis_exit
+slaying /world/world_107_123
+hp 46
+sp 45
+x 7
+y 2
+end
 arch small_stones
 x 7
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 7
+y 3
+end
 arch dirtfloor
 x 7
 y 3
@@ -801,10 +944,14 @@ arch dirtfloor
 x 7
 y 4
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 7
 y 4
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 7
@@ -830,10 +977,18 @@ arch dirtfloor
 x 7
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 7
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 7
+y 11
 end
 arch dirtfloor
 x 7
@@ -872,6 +1027,10 @@ x 8
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 8
+y 3
+end
 arch dirtfloor
 x 8
 y 3
@@ -932,6 +1091,10 @@ arch woodwall_2_1_1
 x 8
 y 10
 end
+arch dungeon_magic
+x 8
+y 11
+end
 arch dirtfloor
 x 8
 y 11
@@ -969,6 +1132,10 @@ x 9
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 9
+y 3
+end
 arch dirtfloor
 x 9
 y 3
@@ -981,10 +1148,14 @@ arch dirtfloor
 x 9
 y 4
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 9
 y 4
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 9
@@ -1024,10 +1195,18 @@ arch dirtfloor
 x 9
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 9
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 9
+y 11
 end
 arch dirtfloor
 x 9
@@ -1066,6 +1245,10 @@ x 10
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 10
+y 3
+end
 arch dirtfloor
 x 10
 y 3
@@ -1166,6 +1349,10 @@ y 10
 unaggressive 1
 sleep 1
 end
+arch dungeon_magic
+x 10
+y 11
+end
 arch dirtfloor
 x 10
 y 11
@@ -1203,6 +1390,10 @@ x 11
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 11
+y 3
+end
 arch dirtfloor
 x 11
 y 3
@@ -1252,6 +1443,10 @@ arch dirtfloor
 x 11
 y 10
 end
+arch dungeon_magic
+x 11
+y 11
+end
 arch dirtfloor
 x 11
 y 11
@@ -1289,6 +1484,10 @@ x 12
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 12
+y 3
+end
 arch dirtfloor
 x 12
 y 3
@@ -1301,9 +1500,14 @@ arch dirtfloor
 x 12
 y 4
 end
-arch chair_1.4
+arch firepot
+name bright firepot
 x 12
 y 4
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 12
@@ -1329,10 +1533,18 @@ arch dirtfloor
 x 12
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 12
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 12
+y 11
 end
 arch dirtfloor
 x 12
@@ -1371,6 +1583,10 @@ x 13
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 13
+y 3
+end
 arch dirtfloor
 x 13
 y 3
@@ -1383,7 +1599,7 @@ arch dirtfloor
 x 13
 y 4
 end
-arch table
+arch chair_1.4
 x 13
 y 4
 end
@@ -1431,6 +1647,10 @@ arch woodwall_2_1_1
 x 13
 y 10
 end
+arch dungeon_magic
+x 13
+y 11
+end
 arch dirtfloor
 x 13
 y 11
@@ -1468,6 +1688,10 @@ x 14
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 14
+y 3
+end
 arch dirtfloor
 x 14
 y 3
@@ -1480,7 +1704,7 @@ arch dirtfloor
 x 14
 y 4
 end
-arch chair_1.2
+arch table
 x 14
 y 4
 end
@@ -1500,10 +1724,14 @@ arch dirtfloor
 x 14
 y 7
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 14
 y 7
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 14
@@ -1521,10 +1749,18 @@ arch dirtfloor
 x 14
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 14
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 14
+y 11
 end
 arch dirtfloor
 x 14
@@ -1563,6 +1799,10 @@ x 15
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 15
+y 3
+end
 arch dirtfloor
 x 15
 y 3
@@ -1575,10 +1815,9 @@ arch dirtfloor
 x 15
 y 4
 end
-arch torch_1
+arch chair_1.2
 x 15
 y 4
-no_pick 1
 end
 arch dirtfloor
 x 15
@@ -1658,6 +1897,10 @@ arch chair_2.3
 x 15
 y 10
 end
+arch dungeon_magic
+x 15
+y 11
+end
 arch dirtfloor
 x 15
 y 11
@@ -1695,6 +1938,10 @@ x 16
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 16
+y 3
+end
 arch dirtfloor
 x 16
 y 3
@@ -1742,12 +1989,6 @@ end
 arch man
 name Haemon
 msg
-@match Zorn
-Yes, I used to be Zorn's manservant. He
-released me with a good pension many
-years ago. He is a *tough* but fair man.
-I am one of the few people to whom he
-entrusted his *given name*.
 @match Tavern|tavern
 I bought this *tavern* with part of my
 pension from *Zorn*.
@@ -1763,6 +2004,12 @@ system.
 It is true that *Zorn* is *tough*. Many
 people have tried to *kill Zorn* but
 very few have been able to *defeat Zorn*.
+@match Zorn
+Yes, I used to be Zorn's manservant. He
+released me with a good pension many
+years ago. He is a *tough* but fair man.
+I am one of the few people to whom he
+entrusted his *given name*.
 @match *
 Hello! Welcome to my *tavern*.
 endmsg
@@ -1788,6 +2035,10 @@ arch dirtfloor
 x 16
 y 10
 end
+arch dungeon_magic
+x 16
+y 11
+end
 arch dirtfloor
 x 16
 y 11
@@ -1825,6 +2076,10 @@ x 17
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 17
+y 3
+end
 arch dirtfloor
 x 17
 y 3
@@ -1857,10 +2112,14 @@ arch dirtfloor
 x 17
 y 7
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 17
 y 7
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 17
@@ -1874,10 +2133,18 @@ arch dirtfloor
 x 17
 y 10
 end
-arch torch_1
+arch firepot
+name bright firepot
 x 17
 y 10
-no_pick 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
+end
+arch dungeon_magic
+x 17
+y 11
 end
 arch dirtfloor
 x 17
@@ -1916,6 +2183,10 @@ x 18
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 18
+y 3
+end
 arch dirtfloor
 x 18
 y 3
@@ -1991,6 +2262,10 @@ arch woodwall_2_1_1
 x 18
 y 10
 end
+arch dungeon_magic
+x 18
+y 11
+end
 arch dirtfloor
 x 18
 y 11
@@ -2028,6 +2303,10 @@ x 19
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 19
+y 3
+end
 arch dirtfloor
 x 19
 y 3
@@ -2081,6 +2360,17 @@ arch chair_1.4
 x 19
 y 10
 end
+arch child_thief
+Wis 1
+x 19
+y 10
+sleep 1
+can_see_in_dark 1
+end
+arch dungeon_magic
+x 19
+y 11
+end
 arch dirtfloor
 x 19
 y 11
@@ -2118,6 +2408,10 @@ x 20
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 20
+y 3
+end
 arch dirtfloor
 x 20
 y 3
@@ -2158,6 +2452,15 @@ arch chair_1.3
 x 20
 y 5
 end
+arch fighter
+msg
+@match *
+<blank stare>
+endmsg
+x 20
+y 5
+sleep 1
+end
 arch dirtfloor
 x 20
 y 6
@@ -2203,6 +2506,10 @@ arch table
 x 20
 y 10
 end
+arch dungeon_magic
+x 20
+y 11
+end
 arch dirtfloor
 x 20
 y 11
@@ -2240,6 +2547,10 @@ x 21
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 21
+y 3
+end
 arch dirtfloor
 x 21
 y 3
@@ -2252,18 +2563,14 @@ arch dirtfloor
 x 21
 y 4
 end
-arch chair_1.2
+arch firepot
+name bright firepot
 x 21
 y 4
-end
-arch fighter
-msg
-@match *
-<blank stare>
-endmsg
-x 21
-y 4
-sleep 1
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 21
@@ -2289,16 +2596,18 @@ arch dirtfloor
 x 21
 y 10
 end
-arch chair_1.2
+arch firepot
+name bright firepot
 x 21
 y 10
+material 0
+glow_radius 4
+no_pass 0
+identified 1
 end
-arch child_thief
-Wis 5
+arch dungeon_magic
 x 21
-y 10
-sleep 1
-can_see_in_dark 1
+y 11
 end
 arch dirtfloor
 x 21
@@ -2337,6 +2646,10 @@ x 22
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 22
+y 3
+end
 arch dirtfloor
 x 22
 y 3
@@ -2408,6 +2721,10 @@ name rough wooden bench
 x 22
 y 10
 end
+arch dungeon_magic
+x 22
+y 11
+end
 arch dirtfloor
 x 22
 y 11
@@ -2445,6 +2762,10 @@ x 23
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 23
+y 3
+end
 arch dirtfloor
 x 23
 y 3
@@ -2567,6 +2888,10 @@ arch food
 x 23
 y 10
 end
+arch dungeon_magic
+x 23
+y 11
+end
 arch dirtfloor
 x 23
 y 11
@@ -2607,6 +2932,10 @@ x 24
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 24
+y 3
+end
 arch dirtfloor
 x 24
 y 3
@@ -2619,29 +2948,19 @@ arch dirtfloor
 x 24
 y 4
 end
-arch barrel
-name bar made from barrels
+arch firepot
+name bright firepot
 x 24
 y 4
 material 0
-no_pick 1
-can_roll 0
-no_magic 1
-damned 1
-end
-arch booze
-x 24
-y 4
+glow_radius 4
+no_pass 0
+identified 1
 end
 arch dirtfloor
 x 24
 y 5
 end
-arch torch_1
-x 24
-y 5
-no_pick 1
-end
 arch dirtfloor
 x 24
 y 6
@@ -2671,32 +2990,22 @@ arch dirtfloor
 x 24
 y 9
 end
-arch torch_1
-x 24
-y 9
-no_pick 1
-end
 arch dirtfloor
 x 24
 y 10
 end
-arch barrel
-name bar made from barrels
+arch firepot
+name bright firepot
 x 24
 y 10
 material 0
-no_pick 1
-can_roll 0
-no_magic 1
-damned 1
+glow_radius 4
+no_pass 0
+identified 1
 end
-arch wine
+arch dungeon_magic
 x 24
-y 10
-end
-arch wine
-x 24
-y 10
+y 11
 end
 arch dirtfloor
 x 24
@@ -2735,6 +3044,10 @@ x 25
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 25
+y 3
+end
 arch dirtfloor
 x 25
 y 3
@@ -2751,6 +3064,11 @@ arch longtable_1_1
 name prep area
 x 25
 y 4
+no_pass 1
+end
+arch booze
+x 25
+y 4
 end
 arch booze
 x 25
@@ -2768,12 +3086,17 @@ arch longtable_2_1_1
 name prep area
 x 25
 y 5
+no_pass 1
 end
-arch booze
+arch coffee
 x 25
 y 5
 end
-arch booze
+arch coffee
+x 25
+y 5
+end
+arch coffee
 x 25
 y 5
 end
@@ -2781,16 +3104,21 @@ arch dirtfloor
 x 25
 y 6
 end
-arch longtable_2_1_1
+arch longtable_1_2
 name prep area
 x 25
 y 6
+no_pass 1
 end
-arch food
+arch wine
 x 25
 y 6
 end
-arch food
+arch wine
+x 25
+y 6
+end
+arch wine
 x 25
 y 6
 end
@@ -2798,27 +3126,20 @@ arch dirtfloor
 x 25
 y 7
 end
-arch longtable_2_1_1
-name prep area
-x 25
-y 7
-end
-arch food
-x 25
-y 7
-end
-arch food
+arch stove
 x 25
 y 7
+is_cauldron 0
 end
 arch dirtfloor
 x 25
 y 8
 end
-arch longtable_2_1_1
+arch longtable_1_1
 name prep area
 x 25
 y 8
+no_pass 1
 end
 arch loaf
 x 25
@@ -2836,6 +3157,7 @@ arch longtable_2_1_1
 name prep area
 x 25
 y 9
+no_pass 1
 end
 arch haggis
 x 25
@@ -2853,6 +3175,7 @@ arch longtable_1_2
 name prep area
 x 25
 y 10
+no_pass 1
 end
 arch onion
 x 25
@@ -2862,6 +3185,10 @@ arch onion
 x 25
 y 10
 end
+arch dungeon_magic
+x 25
+y 11
+end
 arch dirtfloor
 x 25
 y 11
@@ -2903,6 +3230,10 @@ x 26
 y 2
 elevation 25
 end
+arch dungeon_magic
+x 26
+y 3
+end
 arch dirtfloor
 x 26
 y 3
@@ -2911,6 +3242,10 @@ arch woodwall_2_2_3
 x 26
 y 3
 end
+arch dungeon_magic
+x 26
+y 4
+end
 arch dirtfloor
 x 26
 y 4
@@ -2919,6 +3254,10 @@ arch woodwall_win1
 x 26
 y 4
 end
+arch dungeon_magic
+x 26
+y 5
+end
 arch dirtfloor
 x 26
 y 5
@@ -2927,6 +3266,10 @@ arch woodwall_win1
 x 26
 y 5
 end
+arch dungeon_magic
+x 26
+y 6
+end
 arch dirtfloor
 x 26
 y 6
@@ -2935,6 +3278,10 @@ arch woodwall_win1
 x 26
 y 6
 end
+arch dungeon_magic
+x 26
+y 7
+end
 arch dirtfloor
 x 26
 y 7
@@ -2943,6 +3290,10 @@ arch woodwall_win1
 x 26
 y 7
 end
+arch dungeon_magic
+x 26
+y 8
+end
 arch dirtfloor
 x 26
 y 8
@@ -2951,6 +3302,10 @@ arch woodwall_win1
 x 26
 y 8
 end
+arch dungeon_magic
+x 26
+y 9
+end
 arch dirtfloor
 x 26
 y 9
@@ -2959,6 +3314,10 @@ arch woodwall_win1
 x 26
 y 9
 end
+arch dungeon_magic
+x 26
+y 10
+end
 arch dirtfloor
 x 26
 y 10
@@ -2967,6 +3326,10 @@ arch woodwall_win1
 x 26
 y 10
 end
+arch dungeon_magic
+x 26
+y 11
+end
 arch dirtfloor
 x 26
 y 11