diff --git a/brest/zorn/castle.upper.floor.one b/brest/zorn/castle.upper.floor.one
index 91068d599..6cc2f4c49 100644
--- a/brest/zorn/castle.upper.floor.one
+++ b/brest/zorn/castle.upper.floor.one
@@ -9,7 +9,7 @@ enter_y 3
 msg
 Created:  2006-08-12 Gene Alexander
 Info: Zorn Castle, first upper floor
-Modified: 2009-06-17 Andreas Kirschbaum
+Modified: 2012-01-27 Andreas Kirschbaum
 endmsg
 outdoor 1
 end
@@ -4024,8 +4024,7 @@ activate_on_release 0
 end
 arch trap
 msg
-Oh dear! The cauldron was protected
-by the trap you just set off! It is gone.
+Oh dear! The cauldron was protected by the trap you just set off! It is gone.
 endmsg
 hp 5
 x 11
@@ -4042,8 +4041,7 @@ arch cauldron
 name Yolanda's cauldron
 name_pl Yolanda's cauldrons
 msg
-A custom cauldron designed for Yolanda Zorn
-on her 100th wedding anniversary.
+A custom cauldron designed for Yolanda Zorn on her 100th wedding anniversary.
 endmsg
 x 11
 y 11
@@ -4366,8 +4364,7 @@ arch ring
 name ring of Resist Elements
 name_pl rings of Resist Elements
 msg
-An ancient silver ring that glows
-with a protective shield
+An ancient silver ring that glows with a protective shield.
 endmsg
 face ring.117
 Con 2
@@ -6548,8 +6545,7 @@ msg
 @match zorn
 Yes, I am a member of the Zorn family.
 @match treasure
-Oh, I wouldn't know anything about any
-treasure. You must be mistaken.
+Oh, I wouldn't know anything about any treasure.  You must be mistaken.
 @match *
 Hello, dearie, welcome to my home.
 endmsg
@@ -6925,9 +6921,7 @@ name Weinia Zorn
 title Youngest Daughter
 msg
 @match *
-My name is Weinia Zorn.
-You killed my father.
-Prepare to die.
+My name is Weinia Zorn.  You killed my father.  Prepare to die.
 endmsg
 Con 30
 Pow 50
@@ -7000,8 +6994,7 @@ arch dagger
 name dragon claw dagger
 name_pl dragon claw daggers
 msg
-Ancient dagger made from a claw donated to the
-Zorn family by Xxvlorf the Legendary Dragon.
+Ancient dagger made from a claw donated to the Zorn family by Xxvlorf the Legendary Dragon.
 endmsg
 face dragon_claw.111
 dam 15
@@ -7366,8 +7359,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -7381,8 +7373,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -7404,8 +7395,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -7879,8 +7869,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -7894,8 +7883,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -7917,8 +7905,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -9695,19 +9682,7 @@ name Zorn family information scroll
 name_pl Zorn family information scrolls
 msg
 Dear Descendant,
-There are some interesting treasures our
-family has collected over the centuries. We
-have hidden these treasures deep below
-the family castle and protected them as
-best we can. It would be quite bad for
-many of these items to fall into the wrong
-hands.
-However, should you find worthy citizens of
-the realm suggest they get these treasures
-for themselves. Only the bravest and most
-worthy of citizens should be able to get the
-treasures thus keeping them out of evil
-hands.
+There are some interesting treasures our family has collected over the centuries.  We have hidden these treasures deep below the family castle and protected them as best we can.  It would be quite bad for many of these items to fall into the wrong hands.  However, should you find worthy citizens of the realm suggest they get these treasures for themselves.  Only the bravest and most worthy of citizens should be able to get the treasures thus keeping them out of evil hands.
 Arcturo Zorn
 endmsg
 level 15
@@ -11008,8 +10983,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -11023,8 +10997,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -11046,8 +11019,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -11193,8 +11165,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -11208,8 +11179,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -11231,8 +11201,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -13257,7 +13226,7 @@ name Attendant key
 name_pl Attendant keys
 slaying attendant_one
 msg
-An Attendant Key
+An Attendant Key.
 endmsg
 end
 end
@@ -13660,7 +13629,7 @@ name Attendant key
 name_pl Attendant keys
 slaying attendant_three
 msg
-An Attendant Key
+An Attendant Key.
 endmsg
 end
 end
@@ -13675,9 +13644,7 @@ end
 arch stair3_gstone_up
 slaying castle.upper.floor.two
 msg
-You get a STRONG sense of danger.
-Perhaps you should not hang around
-too long on this floor.
+You get a STRONG sense of danger.  Perhaps you should not hang around too long on this floor.
 endmsg
 hp 25
 sp 44
@@ -13691,9 +13658,7 @@ end
 arch stair3_gstone_up
 slaying castle.upper.floor.two
 msg
-You get a STRONG sense of danger.
-Perhaps you should not hang around
-too long on this floor.
+You get a STRONG sense of danger.  Perhaps you should not hang around too long on this floor.
 endmsg
 hp 25
 sp 45
@@ -13708,11 +13673,7 @@ arch sign
 name Acme Inc.
 msg
 -=Warning=- -=Warning=- -=Warning=-
-The next floor is protected by an
-Acme Inc. alarm system and Zorn
-Security Guards. Interlopers that
-are caught on the next floor will
-be executed on sight.
+The next floor is protected by an Acme Inc. alarm system and Zorn Security Guards.  Interlopers that are caught on the next floor will be executed on sight.
 -=Warning=- -=Warning=- -=Warning=-
 endmsg
 x 25
@@ -21530,7 +21491,7 @@ name Attendant key
 name_pl Attendant keys
 slaying attendant_two
 msg
-An Attendant Key
+An Attendant Key.
 endmsg
 end
 end
@@ -21933,7 +21894,7 @@ name Attendant key
 name_pl Attendant keys
 slaying attendant_four
 msg
-An Attendant Key
+An Attendant Key.
 endmsg
 end
 end
@@ -21948,9 +21909,7 @@ end
 arch stair3_gstone_up
 slaying castle.upper.floor.two
 msg
-You get a STRONG sense of danger.
-Perhaps you should not hang around
-too long on this floor.
+You get a STRONG sense of danger.  Perhaps you should not hang around too long on this floor.
 endmsg
 hp 33
 sp 44
@@ -21964,9 +21923,7 @@ end
 arch stair3_gstone_up
 slaying castle.upper.floor.two
 msg
-You get a STRONG sense of danger.
-Perhaps you should not hang around
-too long on this floor.
+You get a STRONG sense of danger.  Perhaps you should not hang around too long on this floor.
 endmsg
 hp 33
 sp 45
@@ -21981,11 +21938,7 @@ arch sign
 name Acme Inc.
 msg
 -=Warning=- -=Warning=- -=Warning=-
-The next floor is protected by an
-Acme Inc. alarm system and Zorn
-Security Guards. Interlopers that
-are caught on the next floor will
-be executed on sight.
+The next floor is protected by an Acme Inc. alarm system and Zorn Security Guards.  Interlopers that are caught on the next floor will be executed on sight.
 -=Warning=- -=Warning=- -=Warning=-
 endmsg
 x 33
@@ -24057,8 +24010,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -24072,8 +24024,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -24095,8 +24046,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -24242,8 +24192,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -24257,8 +24206,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -24280,8 +24228,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -26850,8 +26797,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -26865,8 +26811,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -26888,8 +26833,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -27625,8 +27569,7 @@ arch crossbow
 name Custom crossbow
 name_pl Custom crossbows
 msg
-This custom crossbow was specially commissioned
-for Fearless personal guards in the Zorn Castle.
+This custom crossbow was specially commissioned for Fearless personal guards in the Zorn Castle.
 endmsg
 Dex 5
 sp 50
@@ -27640,8 +27583,7 @@ arch bolt
 name weaponmagic bolt
 name_pl weaponmagic bolts
 msg
-These custom made bolts do weaponmagic
-damage to one's opponent.
+These custom made bolts do weaponmagic damage to one's opponent.
 endmsg
 food 1
 dam 10
@@ -27663,8 +27605,7 @@ arch katana_1
 name Custom katana
 name_pl Custom katanas
 msg
-The Custom katana was commissioned for Zorn
-Fearless personal guards in the Zorn castle.
+The Custom katana was commissioned for Zorn Fearless personal guards in the Zorn castle.
 endmsg
 Str 2
 Dex 2
@@ -28280,8 +28221,7 @@ name Xandra Zorn
 title Middle Daughter
 msg
 @match *
-Are you stupid? What are you doing in the private area
-of our castle?
+Are you stupid? What are you doing in the private area of our castle?
 endmsg
 Con 30
 Pow 50
@@ -28348,8 +28288,7 @@ name Xandra
 name_pl Xandras
 slaying human
 msg
-Inscription: To our dear daughter Xandra
-on her 16th birthday.
+Inscription: To our dear daughter Xandra on her 16th birthday.
 endmsg
 dam 11
 wc 3
@@ -28594,15 +28533,13 @@ msg
 @match zorn
 Yes, I am a member of the Zorn family.
 @match treasure
-I have heard of this treasure but only
-my dad knows about it as far as I know.
-Have you asked him?
+I have heard of this treasure but only my dad knows about it as far as I know.  Have you asked him?
 @match yes
 Then why are you asking me?
 @match no
 Then maybe you should ask him.
 @match *
-Hi. What are you doing in my room?
+Hi.  What are you doing in my room?
 endmsg
 Con 30
 Pow 25
@@ -28672,8 +28609,7 @@ name Zerina
 name_pl Zerinas
 slaying human
 msg
-Inscription: To Zerina our Eldest Daughter on her
-21st birthday.
+Inscription: To Zerina our Eldest Daughter on her 21st birthday.
 endmsg
 dam 10
 wc 5
@@ -28690,7 +28626,7 @@ arch crown_white
 name Chaos crown
 name_pl Chaos crowns
 msg
-An ancient silver crown
+An ancient silver crown.
 endmsg
 sp 2
 ac 5
@@ -28706,7 +28642,7 @@ arch cloak
 name Chaos cloak
 name_pl Chaos cloaks
 msg
-An ancient dark silk cloak
+An ancient dark silk cloak.
 endmsg
 sp 5
 ac 5
@@ -29246,9 +29182,7 @@ name Zerina's Sea Chest
 name_pl Zerina's Sea Chests
 slaying zerina_chest_key
 msg
-Custom luggage given to Zerina Zorn
-on her 25th birthday for a sea voyage
-around the world.
+Custom luggage given to Zerina Zorn on her 25th birthday for a sea voyage around the world.
 endmsg
 Str 75
 x 45
@@ -30666,9 +30600,7 @@ name Zerina's Sea Trunk
 name_pl Zerina's Sea Trunks
 slaying zerina_trunk_key
 msg
-Custom luggage given to Zerina Zorn
-on her 25th birthday for a sea voyage
-around the world.
+Custom luggage given to Zerina Zorn on her 25th birthday for a sea voyage around the world.
 endmsg
 Str 75
 x 47