diff --git a/brest/brest.scrolls b/brest/brest.scrolls
index c592143dd..da5e133d4 100644
--- a/brest/brest.scrolls
+++ b/brest/brest.scrolls
@@ -111,34 +111,36 @@ end
 arch brush
 y 15
 end
-arch swall_2_1_1
-y 15
-end
-arch brush
-y 16
-end
-arch swall_2_1_1
-y 16
-end
-arch brush
-y 17
-end
-arch swall_2_1_1
-y 17
-end
-arch brush
-y 18
-end
 arch swall_3_2
-y 18
+y 15
+no_magic 1
+damned 1
 end
 arch lamppost
 name Lighted fence post
-y 18
+y 15
 glow_radius 5
 no_pass 1
 end
 arch brush
+y 16
+end
+arch swall_2_1_1
+y 16
+end
+arch brush
+y 17
+end
+arch swall_2_1_1
+y 17
+end
+arch brush
+y 18
+end
+arch swall_2_1_1
+y 18
+end
+arch brush
 y 19
 end
 arch swall_2_1_1
@@ -237,7 +239,7 @@ end
 arch brush
 y 35
 end
-arch swall_2_2_1
+arch swall_1_2_half
 y 35
 end
 arch lamppost
@@ -343,19 +345,33 @@ arch brush
 x 1
 y 15
 end
+arch swall_2_1_2
+x 1
+y 15
+no_magic 1
+damned 1
+end
 arch brush
 x 1
 y 16
 end
+arch tree5
+x 1
+y 16
+end
 arch brush
 x 1
 y 17
 end
+arch tree5
+x 1
+y 17
+end
 arch brush
 x 1
 y 18
 end
-arch swall_2_1_2
+arch tree5
 x 1
 y 18
 end
@@ -363,92 +379,131 @@ arch brush
 x 1
 y 19
 end
+arch tree5
+x 1
+y 19
+end
 arch brush
 x 1
 y 20
 end
+arch tree5
+x 1
+y 20
+end
 arch brush
 x 1
 y 21
 end
+arch tree5
+x 1
+y 21
+end
 arch brush
 x 1
 y 22
 end
+arch tree5
+x 1
+y 22
+end
 arch brush
 x 1
 y 23
 end
+arch tree5
+x 1
+y 23
+end
 arch brush
 x 1
 y 24
 end
+arch tree5
+x 1
+y 24
+end
 arch brush
 x 1
 y 25
 end
+arch tree5
+x 1
+y 25
+end
 arch brush
 x 1
 y 26
 end
+arch tree5
+x 1
+y 26
+end
 arch brush
 x 1
 y 27
 end
+arch tree5
+x 1
+y 27
+end
 arch brush
 x 1
 y 28
 end
+arch tree5
+x 1
+y 28
+end
 arch brush
 x 1
 y 29
 end
-arch tree
+arch tree5
 x 1
 y 29
-no_pass 1
-no_magic 1
-damned 1
 end
 arch brush
 x 1
 y 30
 end
-arch tree
+arch tree5
 x 1
 y 30
-no_pass 1
-no_magic 1
-damned 1
 end
 arch brush
 x 1
 y 31
 end
-arch tree
+arch tree5
 x 1
 y 31
-no_pass 1
-no_magic 1
-damned 1
 end
 arch brush
 x 1
 y 32
 end
+arch tree5
+x 1
+y 32
+end
 arch brush
 x 1
 y 33
 end
+arch tree5
+x 1
+y 33
+end
 arch brush
 x 1
 y 34
 end
-arch brush
+arch tree5
 x 1
-y 35
+y 34
 end
-arch swall_2_1_2
+arch brush
 x 1
 y 35
 end
@@ -556,6 +611,12 @@ arch brush
 x 2
 y 15
 end
+arch swall_2_1_2
+x 2
+y 15
+no_magic 1
+damned 1
+end
 arch brush
 x 2
 y 16
@@ -568,10 +629,6 @@ arch brush
 x 2
 y 18
 end
-arch swall_2_1_2
-x 2
-y 18
-end
 arch brush
 x 2
 y 19
@@ -616,35 +673,14 @@ arch brush
 x 2
 y 29
 end
-arch tree
-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
-end
 arch brush
 x 2
 y 31
 end
-arch tree
-x 2
-y 31
-no_pass 1
-no_magic 1
-damned 1
-end
 arch brush
 x 2
 y 32
@@ -661,10 +697,6 @@ arch brush
 x 2
 y 35
 end
-arch swall_2_1_2
-x 2
-y 35
-end
 arch brush
 x 2
 y 36
@@ -769,6 +801,12 @@ arch brush
 x 3
 y 15
 end
+arch swall_2_1_2
+x 3
+y 15
+no_magic 1
+damned 1
+end
 arch brush
 x 3
 y 16
@@ -777,21 +815,18 @@ arch brush
 x 3
 y 17
 end
+arch tree5
+x 3
+y 17
+end
 arch brush
 x 3
 y 18
 end
-arch swall_1_3_half
+arch tree5
 x 3
 y 18
 end
-arch lamppost
-name Lighted fence post
-x 3
-y 18
-glow_radius 5
-no_pass 1
-end
 arch brush
 x 3
 y 19
@@ -828,18 +863,10 @@ arch brush
 x 3
 y 24
 end
-arch tree5
-x 3
-y 24
-end
 arch brush
 x 3
 y 25
 end
-arch tree5
-x 3
-y 25
-end
 arch brush
 x 3
 y 26
@@ -868,21 +895,26 @@ arch brush
 x 3
 y 30
 end
-arch tree
+arch tree5
 x 3
 y 30
-no_pass 1
-no_magic 1
-damned 1
 end
 arch brush
 x 3
 y 31
 end
+arch tree5
+x 3
+y 31
+end
 arch brush
 x 3
 y 32
 end
+arch tree5
+x 3
+y 32
+end
 arch brush
 x 3
 y 33
@@ -895,10 +927,6 @@ arch brush
 x 3
 y 35
 end
-arch swall_2_1_2
-x 3
-y 35
-end
 arch brush
 x 3
 y 36
@@ -982,6 +1010,12 @@ arch brush
 x 4
 y 15
 end
+arch swall_2_1_2
+x 4
+y 15
+no_magic 1
+damned 1
+end
 arch brush
 x 4
 y 16
@@ -1054,19 +1088,27 @@ arch flagstone_2_1_1
 x 4
 y 23
 end
+arch dungeon_magic
+x 4
+y 24
+end
 arch stonefloor2
 x 4
 y 24
 end
-arch flagstone_2_1_1
+arch swall_2_1_1
 x 4
 y 24
 end
+arch dungeon_magic
+x 4
+y 25
+end
 arch stonefloor2
 x 4
 y 25
 end
-arch flagstone_2_1_1
+arch swall_2_1_1
 x 4
 y 25
 end
@@ -1150,10 +1192,6 @@ arch brush
 x 4
 y 35
 end
-arch swall_2_1_2
-x 4
-y 35
-end
 arch brush
 x 4
 y 36
@@ -1248,9 +1286,18 @@ arch brush
 x 5
 y 15
 end
-arch tree5
+arch swall_1_3_half
 x 5
 y 15
+no_magic 1
+damned 1
+end
+arch lamppost
+name Lighted fence post
+x 5
+y 15
+glow_radius 5
+no_pass 1
 end
 arch stonefloor2
 x 5
@@ -1378,10 +1425,6 @@ arch brush
 x 5
 y 35
 end
-arch swall_2_1_2
-x 5
-y 35
-end
 arch brush
 x 5
 y 36
@@ -1427,6 +1470,8 @@ end
 arch swall_2_2_2
 x 6
 y 2
+no_magic 1
+damned 1
 end
 arch brush
 x 6
@@ -1482,6 +1527,8 @@ end
 arch swall_2_2_1
 x 6
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 6
@@ -1627,17 +1674,10 @@ arch brush
 x 6
 y 35
 end
-arch swall_1_3_half
+arch tree5
 x 6
 y 35
 end
-arch lamppost
-name Lighted fence post
-x 6
-y 35
-glow_radius 5
-no_pass 1
-end
 arch brush
 x 6
 y 36
@@ -1745,6 +1785,10 @@ arch brush
 x 7
 y 13
 end
+arch tree5
+x 7
+y 13
+end
 arch stonefloor2
 x 7
 y 14
@@ -1867,6 +1911,10 @@ arch brush
 x 7
 y 36
 end
+arch tree5
+x 7
+y 36
+end
 arch footpath_2_1_2
 x 7
 y 37
@@ -2545,7 +2593,7 @@ arch shop_empty
 x 10
 y 24
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_3
 x 10
 y 24
 end
@@ -2553,7 +2601,7 @@ arch shop_empty
 x 10
 y 25
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_4
 x 10
 y 25
 end
@@ -2617,6 +2665,16 @@ NOT friendly.
 endmsg
 x 10
 y 33
+walk_on 1
+fly_on 1
+end
+arch magic_mouth
+msg
+This side of the shop gives you a feeling of intense danger.
+endmsg
+food 1
+x 10
+y 34
 end
 arch stonefloor2
 x 10
@@ -2697,6 +2755,12 @@ arch brush
 x 11
 y 6
 end
+arch button_small
+x 11
+y 7
+invisible 1
+connected 3
+end
 arch brush
 x 11
 y 7
@@ -2819,18 +2883,10 @@ arch shop_empty
 x 11
 y 24
 end
-arch flagstone_2_1_2
-x 11
-y 24
-end
 arch shop_empty
 x 11
 y 25
 end
-arch flagstone_2_1_2
-x 11
-y 25
-end
 arch shop_scrolls
 exp 20
 x 11
@@ -2888,6 +2944,14 @@ arch shop_mat
 x 11
 y 33
 end
+arch magic_mouth
+msg
+This side of the shop gives you a feeling of intense danger.
+endmsg
+food 1
+x 11
+y 34
+end
 arch button_small
 x 11
 y 34
@@ -2898,6 +2962,12 @@ arch stonefloor2
 x 11
 y 34
 end
+arch button_small
+x 11
+y 35
+invisible 1
+connected 1
+end
 arch stonefloor2
 x 11
 y 35
@@ -3092,18 +3162,10 @@ arch shop_empty
 x 12
 y 24
 end
-arch flagstone_2_1_2
-x 12
-y 24
-end
 arch shop_empty
 x 12
 y 25
 end
-arch flagstone_2_1_2
-x 12
-y 25
-end
 arch shop_scrolls
 exp 20
 x 12
@@ -3161,6 +3223,14 @@ arch stonefloor2
 x 12
 y 33
 end
+arch magic_mouth
+msg
+This side of the shop gives you a feeling of intense danger.
+endmsg
+food 1
+x 12
+y 34
+end
 arch button_small
 x 12
 y 34
@@ -3171,6 +3241,12 @@ arch stonefloor2
 x 12
 y 34
 end
+arch button_small
+x 12
+y 35
+invisible 1
+connected 1
+end
 arch stonefloor2
 x 12
 y 35
@@ -3383,7 +3459,7 @@ arch shop_empty
 x 13
 y 24
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_2
 x 13
 y 24
 end
@@ -3391,7 +3467,7 @@ arch shop_empty
 x 13
 y 25
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_1
 x 13
 y 25
 end
@@ -3448,6 +3524,14 @@ arch menu
 x 13
 y 33
 end
+arch magic_mouth
+msg
+This side of the shop gives you a feeling of intense danger.
+endmsg
+food 1
+x 13
+y 34
+end
 arch stonefloor2
 x 13
 y 34
@@ -4088,6 +4172,10 @@ arch brush
 x 16
 y 13
 end
+arch tree5
+x 16
+y 13
+end
 arch stonefloor2
 x 16
 y 14
@@ -4210,6 +4298,10 @@ arch brush
 x 16
 y 36
 end
+arch tree5
+x 16
+y 36
+end
 arch footpath_2_1_2
 x 16
 y 37
@@ -4241,16 +4333,18 @@ arch brush
 x 17
 y 2
 end
-arch lamppost
-name Lighted fence post
-x 17
-y 2
-glow_radius 5
-no_pass 1
-end
 arch swall_2_2_3
 x 17
 y 2
+no_magic 1
+damned 1
+end
+arch lamppost
+name Lighted fence post
+x 17
+y 2
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 17
@@ -4302,6 +4396,8 @@ x 17
 y 7
 glow_radius 5
 no_pass 1
+no_magic 1
+damned 1
 end
 arch swall_2_2_4
 x 17
@@ -5085,6 +5181,10 @@ end
 arch cyclops
 name Orville
 title hyper cyclops
+msg
+@match *
+ROAR!
+endmsg
 dam 80
 wc -25
 ac -30
@@ -5105,6 +5205,10 @@ end
 arch cyclops
 name Wilbur
 title hyper cyclops
+msg
+@match *
+GRRRRRR!
+endmsg
 dam 80
 wc -25
 ac -30
diff --git a/brest/brest.scrolls.upper.1 b/brest/brest.scrolls.upper.1
index bd37da0f8..79f298ee1 100644
--- a/brest/brest.scrolls.upper.1
+++ b/brest/brest.scrolls.upper.1
@@ -1,18 +1,18 @@
 arch map
 name brest.scrolls.upper.1
 region brest
+shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
+shopgreed 0.95
+shopmin 5
+shopmax 150000
+width 20
+height 24
 msg
 Creator: Gene Alexander
 Editor: CF Java Map Editor
 Date:    3/21/2005
 endmsg
-width 20
-height 24
 outdoor 1
-shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
-shopmin 5
-shopmax 150000
-shopgreed 0.95
 end
 arch blocked
 end
@@ -1053,7 +1053,7 @@ arch shop_empty
 x 8
 y 11
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_3
 x 8
 y 11
 end
@@ -1061,7 +1061,7 @@ arch shop_empty
 x 8
 y 12
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_4
 x 8
 y 12
 end
@@ -1199,18 +1199,10 @@ arch shop_empty
 x 9
 y 11
 end
-arch flagstone_2_1_2
-x 9
-y 11
-end
 arch shop_empty
 x 9
 y 12
 end
-arch flagstone_2_1_2
-x 9
-y 12
-end
 arch shop_scrolls
 exp 35
 x 9
@@ -1364,18 +1356,10 @@ arch shop_empty
 x 10
 y 11
 end
-arch flagstone_2_1_2
-x 10
-y 11
-end
 arch shop_empty
 x 10
 y 12
 end
-arch flagstone_2_1_2
-x 10
-y 12
-end
 arch shop_scrolls
 exp 35
 x 10
@@ -1522,7 +1506,7 @@ arch shop_empty
 x 11
 y 11
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_2
 x 11
 y 11
 end
@@ -1530,7 +1514,7 @@ arch shop_empty
 x 11
 y 12
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_1
 x 11
 y 12
 end
@@ -2593,52 +2577,16 @@ end
 arch baslic
 name unusual basilisk
 title guard
-randomitems none
-level 120
-exp 400000
-speed -0.5
-dam 50
-wc -100
 hp 12000
 maxhp 12000
+exp 400000
+dam 50
+wc -100
 ac -120
-Con 50
-can_see_in_dark 1
-unaggressive 1
-resist_physical 95
-resist_magic 95
-resist_fire 0
-resist_electricity 95
-resist_confusion 95
-resist_acid 95
-resist_drain 95
-resist_weaponmagic 95
-resist_ghosthit 95
-resist_poison 100
-resist_slow 95
-resist_paralyze 50
-resist_deplete 95
-resist_turn_undead 95
-resist_death 95
-resist_chaos 95
-resist_holyword 95
-resist_godpower 95
 x 4
 y 11
-end
-arch baslic
-name unusual basilisk
-title guard
-randomitems none
-level 120
-exp 400000
 speed -0.5
-dam 50
-wc -100
-hp 12000
-maxhp 12000
-ac -120
-unaggressive 1
+level 120
 resist_physical 95
 resist_magic 95
 resist_fire 0
@@ -2651,12 +2599,84 @@ resist_ghosthit 95
 resist_poison 100
 resist_slow 95
 resist_paralyze 50
-resist_deplete 95
 resist_turn_undead 95
+resist_deplete 95
 resist_death 95
 resist_chaos 95
-resist_holyword 95
 resist_godpower 95
-x 13
-y 6
+resist_holyword 95
+randomitems none
+unaggressive 1
+can_use_skill 1
+arch skill_clawing
+can_use_skill 1
+end
+arch abil_fear
+level 60
+end
+arch abil_icestorm
+level 60
+end
+arch abil_large_icestorm
+level 60
+end
+arch abil_poison_cloud
+level 60
+end
+arch gem
+nrof 500
+end
+end
+arch baslic
+name unusual basilisk
+title guard
+hp 12000
+maxhp 12000
+exp 400000
+dam 50
+wc -100
+ac -120
+x 13
+y 11
+speed -0.5
+level 120
+resist_physical 95
+resist_magic 95
+resist_fire 0
+resist_electricity 95
+resist_confusion 95
+resist_acid 95
+resist_drain 95
+resist_weaponmagic 95
+resist_ghosthit 95
+resist_poison 100
+resist_slow 95
+resist_paralyze 50
+resist_turn_undead 95
+resist_deplete 95
+resist_death 95
+resist_chaos 95
+resist_godpower 95
+resist_holyword 95
+randomitems none
+unaggressive 1
+can_use_skill 1
+arch skill_clawing
+can_use_skill 1
+end
+arch abil_fear
+level 60
+end
+arch abil_icestorm
+level 60
+end
+arch abil_large_icestorm
+level 60
+end
+arch abil_poison_cloud
+level 60
+end
+arch gem
+nrof 500
+end
 end
diff --git a/brest/brest.scrolls.upper.2 b/brest/brest.scrolls.upper.2
index 8028ec1ee..fa43bcc17 100644
--- a/brest/brest.scrolls.upper.2
+++ b/brest/brest.scrolls.upper.2
@@ -1057,7 +1057,7 @@ arch shop_empty
 x 8
 y 11
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_3
 x 8
 y 11
 end
@@ -1065,7 +1065,7 @@ arch shop_empty
 x 8
 y 12
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_4
 x 8
 y 12
 end
@@ -1212,18 +1212,10 @@ arch shop_empty
 x 9
 y 11
 end
-arch flagstone_2_1_2
-x 9
-y 11
-end
 arch shop_empty
 x 9
 y 12
 end
-arch flagstone_2_1_2
-x 9
-y 12
-end
 arch shop_scrolls
 exp 50
 x 9
@@ -1374,18 +1366,10 @@ arch shop_empty
 x 10
 y 11
 end
-arch flagstone_2_1_2
-x 10
-y 11
-end
 arch shop_empty
 x 10
 y 12
 end
-arch flagstone_2_1_2
-x 10
-y 12
-end
 arch shop_scrolls
 exp 50
 x 10
@@ -1532,7 +1516,7 @@ arch shop_empty
 x 11
 y 11
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_2
 x 11
 y 11
 end
@@ -1540,7 +1524,7 @@ arch shop_empty
 x 11
 y 12
 end
-arch flagstone_2_1_2
+arch flagstone_2_2_1
 x 11
 y 12
 end