diff --git a/brest/zorn/castle.upper.floor.three b/brest/zorn/castle.upper.floor.three
index 2c7708943..61f82abc7 100644
--- a/brest/zorn/castle.upper.floor.three
+++ b/brest/zorn/castle.upper.floor.three
@@ -9479,6 +9479,10 @@ arch redslate
 x 29
 y 9
 end
+arch longtable_1_1
+x 29
+y 9
+end
 arch cloak
 name Zorn cloak
 name_pl Zorn cloaks
@@ -9507,6 +9511,10 @@ arch redslate
 x 29
 y 10
 end
+arch longtable_1_2
+x 29
+y 10
+end
 arch bracers_dex
 name Zorn bracers
 title of paralyzing attack
@@ -19396,34 +19404,36 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 2
+run_away 0
 arch rod_light
-hp 150
-maxhp 150
-level 100
+hp 500
+maxhp 500
+sp 90
+level 110
 startequip 1
-arch spell_comet
-end
 end
 arch scroll_new
+sp 3
 nrof 10
-arch spell_large_fireball
-end
+level 110
 end
 arch scroll_new
+sp 6
 nrof 10
-arch spell_large_lightning
-end
+level 110
 end
 arch scroll_new
+sp 57
 nrof 10
-arch spell_hellfire
-end
+level 110
 end
 arch key2
 name pyromancy scroll key
 name_pl pyromancy scroll keys
 slaying pyromancy_scroll_key
 end
+arch stylus
+end
 end
 arch big_wiz
 name Summoning Scroll Writer
@@ -19455,33 +19465,36 @@ resist_death 65
 resist_chaos 65
 path_attuned 64
 arch rod_light
-hp 150
-maxhp 150
-level 100
-startequip 1
-arch spell_magehound
-end
+hp 500
+maxhp 500
+sp 128
+level 110
 end
 arch scroll_new
+sp 91
 nrof 10
-arch spell_mystic_fist
-end
+level 110
 end
 arch scroll_new
+sp 65
 nrof 10
-arch spell_summon_pet_monster
-end
+level 110
 end
 arch scroll_new
+other_arch devil
+sp 9
 nrof 10
-arch spell_summon_devil
-end
+level 110
 end
 arch key2
 name summoning scroll key
 name_pl summoning scroll keys
 slaying summoning_scroll_key
 end
+arch spell_magehound
+end
+arch stylus
+end
 end
 arch big_wiz
 name Pyromancy Book Writer
@@ -19512,13 +19525,13 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 2
+run_away 0
 arch rod_light
-hp 150
-maxhp 150
-level 100
+hp 500
+maxhp 500
+sp 90
+level 110
 startequip 1
-arch spell_comet
-end
 end
 arch pyro_book
 end
@@ -19531,6 +19544,8 @@ name pyromancy book key
 name_pl pyromancy book keys
 slaying pyromancy_book_key
 end
+arch stylus
+end
 end
 arch big_wiz
 name Summoning Book Writer
@@ -19562,14 +19577,15 @@ resist_death 65
 resist_chaos 65
 path_attuned 64
 arch rod_light
-hp 150
-maxhp 150
-level 100
-startequip 1
-arch spell_magehound
-end
+hp 500
+maxhp 500
+sp 123
+level 110
 end
 arch summoner_book
+randomitems none
+arch spell_magehound
+end
 end
 arch summoner_book_l1
 end
@@ -19580,19 +19596,53 @@ name summoning book key
 name_pl summoning book keys
 slaying summoning_book_key
 end
+arch spell_magehound
+end
+arch stylus
+end
+end
+arch Cwyvern
+name Zorn wyvern of chaos
+title Guardian of the Treasure
+Con 50
+Wis 20
+Pow 50
+exp 2000000
+wc -95
+ac -95
+x 25
+y 12
+level 109
+attacktype 262429
+resist_magic 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_poison -25
+resist_slow 50
+resist_fear 100
+resist_deplete 50
+resist_chaos 50
+resist_godpower 20
+resist_holyword 50
+run_away 0
 end
 arch big_chaos_dragon
 name Zorn dragon of chaos
-title Guardian of the Third Upper Floor
+title Guardian of the Treasure
 Con 75
-Wis 13
+Wis 20
+Pow 20
+sp 0
+maxsp 250
 exp 4500000
 dam 50
 wc -95
 ac -95
 x 28
 y 13
-level 100
+level 110
 attacktype 262429
 resist_magic 75
 resist_confusion 75
@@ -19601,13 +19651,40 @@ resist_drain 75
 resist_weaponmagic 25
 resist_poison -25
 resist_slow 75
-resist_fear 75
+resist_fear 100
 resist_deplete 75
 resist_chaos 75
 resist_godpower 20
 resist_holyword 75
 path_attuned 14
-run_away 1
+run_away 0
+end
+arch Cwyvern
+name Zorn wyvern of chaos
+title Guardian of the Treasure
+Con 50
+Wis 20
+Pow 50
+exp 2000000
+wc -95
+ac -95
+x 32
+y 12
+level 109
+attacktype 262429
+resist_magic 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_poison -25
+resist_slow 50
+resist_fear 100
+resist_deplete 50
+resist_chaos 50
+resist_godpower 20
+resist_holyword 50
+run_away 0
 end
 arch big_wiz
 name Evocation Scroll Writer
@@ -19638,34 +19715,36 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 4
+run_away 0
 arch rod_light
-hp 150
-maxhp 150
-level 100
+hp 500
+maxhp 500
+sp 88
+level 110
 startequip 1
-arch spell_ball_lightning
-end
 end
 arch scroll_new
+sp 180
 nrof 10
-arch spell_large_icestorm
-end
+level 110
 end
 arch scroll_new
+sp 17
 nrof 10
-arch spell_large_snowstorm
-end
+level 110
 end
 arch scroll_new
+sp 113
 nrof 10
-arch spell_mana_blast
-end
+level 110
 end
 arch key2
 name evocation scroll key
 name_pl evocation scroll keys
 slaying evocation_scroll_key
 end
+arch stylus
+end
 end
 arch big_wiz
 name Sorcery Scroll Writer
@@ -19696,34 +19775,36 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 16
-arch rod_light
-hp 150
-maxhp 150
-level 100
-startequip 1
-arch spell_color_spray
-end
+run_away 0
+arch scroll_new
+sp 64
+nrof 10
+level 110
 end
 arch scroll_new
+sp 23
 nrof 10
-arch spell_confusion
-end
+level 110
 end
 arch scroll_new
+sp 63
 nrof 10
-arch spell_improved_invisibility
-end
-end
-arch scroll_new
-nrof 10
-arch spell_identify
-end
+level 110
 end
 arch key2
 name sorcery scroll key
 name_pl sorcery scroll keys
 slaying sorcery_scroll_key
 end
+arch rod_light
+hp 500
+maxhp 500
+sp 85
+level 110
+startequip 1
+end
+arch stylus
+end
 end
 arch big_wiz
 name Evocation Book Writer
@@ -19754,14 +19835,7 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 4
-arch rod_light
-hp 150
-maxhp 150
-level 100
-startequip 1
-arch spell_ball_lightning
-end
-end
+run_away 0
 arch evoker_book
 end
 arch evoker_book_l1
@@ -19773,6 +19847,15 @@ name evocation book key
 name_pl evocation book keys
 slaying evocation_book_key
 end
+arch rod_light
+hp 500
+maxhp 500
+sp 88
+level 110
+startequip 1
+end
+arch stylus
+end
 end
 arch big_wiz
 name Sorcery Book Writer
@@ -19803,14 +19886,7 @@ resist_deplete 65
 resist_death 65
 resist_chaos 65
 path_attuned 16
-arch rod_light
-hp 150
-maxhp 150
-level 100
-startequip 1
-arch spell_color_spray
-end
-end
+run_away 0
 arch sorcerer_book
 end
 arch sorcerer_book_l1
@@ -19822,4 +19898,13 @@ name sorcery book key
 name_pl sorcery book keys
 slaying sorcery_book_key
 end
+arch rod_light
+hp 500
+maxhp 500
+sp 85
+level 110
+startequip 1
+end
+arch stylus
+end
 end