Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1

50 files changed, 20822 insertions, 12271 deletions

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 2e9c38b2..c1ab7fa1 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -32,8 +32,11 @@ N:1:of Galadriel
 I:39:100:4
 W:20:10:10:10000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEARCH | LITE3 | LUCK
-F:INSTA_ART | HIDE_TYPE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:LUCK
 a:LIGHT
 D:A small crystal phial, with the light of Earendil's Star contained inside.  
 D:Its light is imperishable, and near it darkness cannot endure.
@@ -45,8 +48,14 @@ N:2:of Elendil
 I:39:101:1
 W:30:25:5:32500
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE |
-F:INSTA_ART | SPEED | LITE3 | LITE1 | HIDE_TYPE
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:LITE3
+F:SEE_INVIS
+F:SPEED
 a:MAP_LIGHT
 Z:detect curses
 D:The shining Star of the West, a famed heirloom of Elendil's house.
@@ -59,8 +68,18 @@ N:3:of Thrain
 I:39:102:3
 W:50:50:5:50000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_CHAOS | HIDE_TYPE | LUCK
-F:INSTA_ART | SPEED | RES_LITE | RES_DARK | ESP_ORC | LITE3
+F:ACTIVATE
+F:ESP_ORC
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SPEED
 a:THRAIN
 D:A great globe seemingly filled with moonlight, the famed Heart of the 
 D:Mountain, which splinters the light that falls upon it into a thousand 
@@ -72,9 +91,11 @@ D:glowing shards.
 N:4:of Carlammas
 I:40:10:2
 W:50:10:3:60000
-F:CON | HIDE_TYPE | 
-F:ACTIVATE | RES_FIRE | 
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
 F:INSTA_ART
+F:RES_FIRE
 a:PROT_EVIL
 D:A fiery circle of bronze, with mighty spells to ward off evil.
 
@@ -84,10 +105,18 @@ D:A fiery circle of bronze, with mighty spells to ward off evil.
 N:5:of Ingwe
 I:40:11:3
 W:65:30:3:90000
-F:INT | WIS | CHR | SEARCH | INFRA | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | ACTIVATE | 
-F:RES_ACID | RES_COLD | RES_ELEC | 
+F:ACTIVATE
+F:CHR
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:WIS
 a:DISP_EVIL
 D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing 
 D:of evil could stand.
@@ -98,9 +127,18 @@ D:of evil could stand.
 N:6:'Nauglamir'
 I:40:12:3
 W:70:50:3:75000
-F:STR | CON | DEX | INFRA | HIDE_TYPE | RES_FEAR | 
-F:SEE_INVIS | FREE_ACT | REGEN | LITE3 | SPEED | 
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:LITE3
+F:REGEN
+F:RES_FEAR
+F:SEE_INVIS
+F:SPEED
+F:STR
 D:A carencet of gold, set with a multitude of shining gems of 
 D:Valinor.  Despite its size, its weight seems as that of gossamer.
 
@@ -112,10 +150,16 @@ D:Valinor.  Despite its size, its weight seems as that of gossamer.
 N:7:of Flare
 I:45:52:3
 W:50:35:2:75000
-F:STR | CON | CHR | HIDE_TYPE |
-F:IM_FIRE | ACTIVATE | SEARCH |
-F:ESP_THUNDERLORD | SEE_INVIS | FLY |
+F:ACTIVATE
+F:CHR
+F:CON
+F:ESP_THUNDERLORD
+F:FLY
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
+F:SEE_INVIS
+F:STR
 a:DIM_DOOR
 Z:swap position
 D:The mighty ring of the Thunderlord Flare that makes the wearer 
@@ -129,9 +173,19 @@ D:of Thunderlords.
 N:8:of Barahir
 I:45:32:1
 W:50:25:2:75000
-F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE | 
-F:RES_POIS | RES_DARK | ACTIVATE | SEE_INVIS | SEARCH |
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
 F:INSTA_ART
+F:INT
+F:RES_DARK
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:STR
+F:WIS
 a:BARAHIR
 D:A ring shaped into twinned serpents with eyes of emerald meeting beneath 
 D:a crown of flowers, an ancient treasure of Isildur's house.
@@ -142,9 +196,14 @@ D:a crown of flowers, an ancient treasure of Isildur's house.
 N:9:of Tulkas
 I:45:33:4
 W:70:50:2:175000
-F:STR | DEX | CON | HIDE_TYPE | 
-F:ACTIVATE | SPEED | ESP_EVIL | 
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_EVIL
+F:HIDE_TYPE
 F:INSTA_ART
+F:SPEED
+F:STR
 a:TULKAS
 D:The treasure of Tulkas, most fleet and wrathful of the Valar.
 
@@ -155,11 +214,28 @@ N:10:of Power 'Narya'
 I:45:34:1
 W:70:30:2:100000
 P:0:1d1:6:6:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK
-F:ACTIVATE | FREE_ACT | SEE_INVIS | 
-F:SUST_STR | SUST_CON | SUST_WIS | SUST_CHR | SPECIAL_GENE |
-F:IM_FIRE | RES_NETHER | RES_FEAR | REGEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
+F:INT
+F:LUCK
+F:REGEN
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 a:NARYA
 D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -172,11 +248,28 @@ N:11:of Power 'Nenya'
 I:45:35:2
 W:80:40:2:200000
 P:0:1d1:9:9:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | SUST_CHR |
-F:IM_COLD | RES_BLIND | STEALTH | ESP_ALL | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:ESP_ALL
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_COLD
 F:INSTA_ART
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:RES_BLIND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:STR
+F:SUST_CHR
+F:SUST_INT
+F:SUST_WIS
+F:WIS
 a:NENYA
 D:The Ring of Adamant, with a pure white stone as centrepiece.  Nenya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -189,12 +282,30 @@ N:12:of Power 'Vilya'
 I:45:36:3
 W:90:50:2:300000
 P:0:1d1:12:12:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:FEATHER | SLOW_DIGEST | REGEN | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:IM_ELEC | RES_POIS | RES_DISEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ELEC
 F:INSTA_ART
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:REGEN
+F:RES_DISEN
+F:RES_POIS
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIS
 a:VILYA
 D:The Ring of Sapphire, with clear blue gems that shine like stars, 
 D:glittering untouchable despite all that Sauron ever wrought.  Vilya is 
@@ -208,15 +319,47 @@ N:13:of Power 'The One Ring'
 I:45:37:5
 W:100:100:2:5000000
 P:0:1d1:15:15:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | 
-F:ACTIVATE | AUTO_CURSE | HEAVY_CURSE | INVIS | SPELL | MANA |
-F:SEE_INVIS | REGEN | FREE_ACT | CURSED | CURSE_NO_DROP | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | PERMA_CURSE |
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:SUST_INT | SUST_WIS | SUST_CHR | 
-F:RES_BLIND | RES_POIS | RES_DISEN | RES_NETHER | ESP_ALL | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP | 
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_ALL
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
 F:INSTA_ART
+F:INT
+F:INVIS
+F:MANA
+F:PERMA_CURSE
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SEE_INVIS
+F:SPEED
+F:SPELL
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 a:POWER
 Z:change the world
 D:"Ash nazg durbatuluk, ash nazg gimbatul, ash nazg thrakatuluk agh 
@@ -231,7 +374,8 @@ N:14:of Space-Time
 I:39:105:0
 W:30:12:15:50000
 P:0:1d1:0:0:0
-F:INSTA_ART | LITE1
+F:INSTA_ART
+F:LITE1
 D:A powerful stone that provides a strong light for any who 
 D:wields it. It is rumoured that it may even protect the wearer from 
 D:the passing of time.
@@ -246,8 +390,11 @@ N:15:of Lore
 I:39:106:0
 W:15:12:15:20000
 P:0:1d1:0:0:0
-F:ACTIVATE | SPECIAL_GENE | EASY_USE | LITE1 | 
+F:ACTIVATE
+F:EASY_USE
 F:INSTA_ART
+F:LITE1
+F:SPECIAL_GENE
 a:STONE_LORE
 D:A great emerald that fills your mind with images of knowledge and dreadful 
 D:understanding as you stare into its depths.
@@ -259,10 +406,19 @@ N:16:'Razorback'
 I:38:6:0
 W:90:9:500:400000
 P:30:2d4:-4:0:25
-F:FREE_ACT | IM_ELEC | SPECIAL_GENE |
-F:RES_FIRE | RES_COLD | RES_POIS | RES_LITE | RES_DARK | 
-F:LITE1 | SEE_INVIS | AGGRAVATE | ESP_DRAGON
 F:ACTIVATE
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FREE_ACT
+F:IM_ELEC
+F:LITE1
+F:RES_COLD
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
 a:RAZORBACK
 D:A massive suit of heavy dragon scales deeply saturated with many colours.  
 D:It throbs with angry energies, and you feel the raw elemental might of 
@@ -276,12 +432,33 @@ N:17:of Eternity
 I:38:30:0
 W:100:16:600:500000
 P:50:2d4:-8:0:35
-F:HOLD_LIFE | REGEN | ESP_DRAGON | 
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FEATHER | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK | ULTIMATE | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SPECIAL_GENE
 F:ACTIVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
 a:BLADETURNER
 D:A suit of adamant, set with scales of every colour, surrounded in a nimbus 
 D:of perfectly untramelled yet inextricably intermingled and utterly mastered 
@@ -294,9 +471,20 @@ N:18:of Melkor
 I:22:2:-4
 W:65:45:200:100000
 P:0:4d6:12:24:0
-F:STEALTH | WIS | CURSED | HEAVY_CURSE | TY_CURSE | ESP_GOOD | 
-F:DRAIN_MANA | DRAIN_HP | 
-F:RES_DARK | RES_BLIND | RES_LITE | RES_NETHER | BRAND_POIS | RES_CONF
+F:BRAND_POIS
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:RES_BLIND
+F:RES_CONF
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:STEALTH
+F:TY_CURSE
+F:WIS
 D:The mighty spear used once by Melkor to slay the trees of Valinor.
 
 
@@ -306,10 +494,19 @@ N:19:'Soulkeeper'
 I:37:30:2
 W:75:9:420:300000
 P:40:2d4:-4:0:20
-F:CON | 
-F:HOLD_LIFE | SUST_CON | ESP_UNDEAD | RES_CONF | RES_FEAR | 
-F:RES_ACID | RES_COLD | RES_DARK | RES_NETHER | RES_NEXUS | RES_CHAOS | 
 F:ACTIVATE
+F:CON
+F:ESP_UNDEAD
+F:HOLD_LIFE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SUST_CON
 a:CURE_1000
 D:A suit of imperishable adamant, with unconquerable strength to endure evil 
 D:and disruptive magics, that protects the life force of its wearer as 
@@ -322,9 +519,14 @@ N:20:of Isildur
 I:37:15:1
 W:30:3:300:50000
 P:25:2d4:0:0:25
-F:CON | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_SOUND | RES_CONF | RES_NEXUS
+F:CON
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SOUND
 D:A gleaming steel suit covering the wearer from neck to foot, with runes of 
 D:warding and stability deeply engraved into its surface.
 
@@ -335,8 +537,18 @@ N:21:of the Rohirrim
 I:37:9:2
 W:30:3:200:30000
 P:19:1d4:0:0:15
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_CONF | RES_SOUND
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STR
 D:A stiff suit of armour composed of small metal plates sewn to an 
 D:inner layer of heavy canvas, and covered with a second layer of 
 D:cloth.  Within it is the spirit of Eorl the Young, matchless in combat.
@@ -348,11 +560,19 @@ N:22:'Belegennon'
 I:37:20:4
 W:40:10:150:135000
 P:28:1d4:-1:0:20
-F:STEALTH | WIS | INT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:HOLD_LIFE | RES_DARK | RES_FEAR |
-F:SEE_INVIS |
 F:ACTIVATE
+F:HOLD_LIFE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:WIS
 a:BELEGENNON
 D:This wondrous suit of fine-linked chain shimmers as though of pure silver.  
 D:It stands untouched amidst the fury of the elements, and a power of 
@@ -365,9 +585,18 @@ N:23:of Celeborn
 I:37:25:4
 W:40:3:250:150000
 P:35:2d4:-3:0:25
-F:STR | CHR | HIDE_TYPE | ESP_ORC
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK | 
-F:RES_DISEN | ACTIVATE
+F:ACTIVATE
+F:CHR
+F:ESP_ORC
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:STR
 a:GENOCIDE
 D:A shimmering suit of true-silver, forged long ago by dwarven smiths of 
 D:legend.  It gleams with purest white as you gaze upon it, and mighty are 
@@ -380,8 +609,16 @@ N:24:of Arvedui
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:-2:0:15
-F:STR | CHR | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SHARDS | RES_NEXUS
+F:CHR
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SHARDS
+F:STR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, well padded 
 D:with leather. You feel strong and tall as Arvedui, last king of Arnor, 
 D:as you put it on.
@@ -393,8 +630,15 @@ N:25:of Caspanion
 I:37:6:3
 W:25:9:270:40000
 P:16:1d4:-2:0:20
-F:INT | WIS | CON | HIDE_TYPE | 
-F:RES_ACID | RES_POIS | RES_CONF | ACTIVATE
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_CONF
+F:RES_POIS
+F:WIS
 a:DEST_DOOR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, strategically 
 D:reinforced at vital locations with a second layer of chain.  Magics to 
@@ -407,11 +651,28 @@ N:26:of Marda
 I:36:16:5
 W:70:3:80:80000
 P:9:0d0:0:0:25
-F:FREE_ACT | RES_BLIND | RES_CONF | RES_FEAR | DRAIN_MANA | 
-F:REFLECT | RES_NEXUS | SH_FIRE | SUST_INT | SUST_CON | SUST_CHR |
-F:ESP_THUNDERLORD | CON | CHR | INT | 
-F:RES_ACID | RES_ELEC | IM_COLD | RES_COLD | AGGRAVATE | HEAVY_CURSE |
+F:AGGRAVATE
+F:CHR
+F:CON
 F:CURSED
+F:DRAIN_MANA
+F:ESP_THUNDERLORD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:IM_COLD
+F:INT
+F:REFLECT
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_NEXUS
+F:SH_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_INT
 D:The flying suit of Marda, very powerful armour that protects 
 D:the wearer from cold.  Wonderful as this mighty 
 D:armour is, beware wearing it, for it has been cursed by a 
@@ -425,9 +686,21 @@ N:27:of Trone
 I:36:16:4
 W:30:3:80:65000
 P:9:0d0:0:0:20
-F:REFLECT | RES_NEXUS | SH_FIRE | FLY | SPECIAL_GENE | 
-F:STEALTH | ESP_THUNDERLORD | CON | INT | SPEED | 
-F:RES_ACID | RES_ELEC | IM_FIRE | RES_COLD
+F:CON
+F:ESP_THUNDERLORD
+F:FLY
+F:IM_FIRE
+F:INT
+F:RANDOM_RESIST
+F:REFLECT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_NEXUS
+F:SH_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
 D:The flying suit of Trone.  It protects the user from fire and 
 D:imps are said to be less annoying with this on.
 
@@ -438,8 +711,13 @@ N:28:'Thalkettoth'
 I:36:11:3
 W:20:3:60:25000
 P:11:1d1:-1:0:25
-F:DEX | SPEED | HIDE_TYPE | SPECIAL_GENE |
-F:RES_ACID | RES_SHARDS
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
 D:A tunic and skirt sewn with thick, overlapping scales of hardened 
 D:leather whose wearer moves with agility and assurance.
 
@@ -450,8 +728,18 @@ N:29:of Wormtongue
 I:30:2:3
 W:40:20:20:50000
 P:2:1d1:-10:-10:10
-F:INT | DEX | CHR | STEALTH | SEARCH | SPEED | HIDE_TYPE | 
-F:FREE_ACT | FEATHER | RES_DARK | RES_LITE | ESP_GOOD | ESP_UNIQUE
+F:CHR
+F:DEX
+F:ESP_GOOD
+F:ESP_UNIQUE
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
 Z:panic hit
 D:The pair of boots used by Grima son of Galmod, also named the Wormtongue:  
 D:a treacherous but persuasive counsellor, ever ready to betray, sneak, 
@@ -464,9 +752,15 @@ N:30:of Thorin
 I:34:3:4
 W:30:6:65:60000
 P:3:1d2:0:0:25
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | IM_ACID | RES_SOUND | 
-F:RES_CHAOS | ESP_ORC
+F:CON
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:RANDOM_RESIST
+F:RES_CHAOS
+F:RES_SOUND
+F:STR
 D:Invoking the strength and endurance of Thorin, King under the Mountain, 
 D:this little metal shield is proof against the Element of Earth.
 
@@ -477,7 +771,13 @@ N:31:of Celegorm
 I:34:4:0
 W:30:3:60:12000
 P:4:1d2:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_DARK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
 D:This shield emblazoned with a multitude of creatures not seen for ages 
 D:once protected Celegorm, lord of Himlad; around it lies a mystic balance 
 D:that contains the conflicts of the elements.
@@ -489,8 +789,18 @@ N:32:of Anarion
 I:34:5:0
 W:40:9:120:160000
 P:5:1d3:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SUST_STR | SUST_INT | 
-F:SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR | ESP_EVIL
+F:ESP_EVIL
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:The great metal-bound shield of Anarion, son of Elendil, who Sauron found 
 D:himself powerless to wither or diminish.
 
@@ -501,9 +811,19 @@ N:33:of Hurin
 I:22:10:3
 W:20:15:180:90000
 P:0:2d6:12:20:0
-F:STR | CON | HIDE_TYPE | BRAND_ACID | RES_ACID | LITE1 | DRAIN_MANA | 
-F:SLAY_ORC | KILL_DEMON | SLAY_TROLL | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ACID
+F:CON
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
 F:MUST2H
+F:RES_ACID
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 a:HURIN
 D:Wielded by Hurin Thalion in the Fifth Battle of Beleriand, this 
@@ -516,12 +836,32 @@ N:34:of Morgoth
 I:33:50:125
 W:100:1:20:10000000
 P:0:1d1:0:0:0
-F:STR | INT | WIS | DEX | CON | CHR | INFRA | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:RES_LITE | RES_DARK | RES_CONF | RES_NEXUS | RES_NETHER | 
-F:LITE1 | SEE_INVIS | ESP_ALL |
-F:CURSED | HEAVY_CURSE | PERMA_CURSE |
-F:INSTA_ART | SPECIAL_GENE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:INT
+F:LITE1
+F:PERMA_CURSE
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:STR
+F:WIS
 D:Two Silmarils of Feanor blaze from the thunderous crown of twisted 
 D:iron. The corrupted metal feels at once as infernal as hellfire 
 D:and as chilling as the Outer Darkness. One protrusion from the 
@@ -534,9 +874,19 @@ N:35:of Beruthiel
 I:33:10:-5
 W:40:12:20:0
 P:0:1d1:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:FREE_ACT | SEE_INVIS | ESP_ANIMAL | ESP_EVIL | ESP_NONLIVING | ESP_ALL | 
-F:CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:SEE_INVIS
+F:STR
 D:The midnight-hued steel circlet of the sorceress-queen Beruthiel, which 
 D:grants extraordinary powers of sight and awareness at a terrible physical 
 D:cost.
@@ -548,8 +898,14 @@ N:36:of Thranduil
 I:32:2:2
 W:20:2:15:50000
 P:2:0d0:0:0:10
-F:INT | WIS | HIDE_TYPE | 
-F:RES_BLIND | ESP_ORC | ESP_EVIL | ESP_TROLL
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_BLIND
+F:WIS
 D:The hunting cap of King Thranduil, to whose ears come all the secrets of 
 D:his forest domain.
 
@@ -560,7 +916,11 @@ N:37:of Thengel
 I:32:3:3
 W:10:2:20:22000
 P:3:1d1:0:0:12
-F:WIS | CHR | RES_CONF | HIDE_TYPE | LUCK
+F:CHR
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:WIS
 D:A ridged helmet made of steel, and embossed with scenes of valour in fine-
 D:engraved silver.  It grants the wearer nobility, clarity of thought and 
 D:understanding.
@@ -572,9 +932,20 @@ N:38:of Hammerhand
 I:32:6:3
 W:20:2:60:45000
 P:6:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | SPECIAL_GENE | RES_FEAR | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:RES_ACID | RES_NEXUS | RES_COLD | RES_DARK | SLOW_DIGEST | 
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_FEAR
+F:RES_NEXUS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 Z:berserk
 D:A great helm as steady as the heroes of the Westdike. Mighty were the 
 D:blows of Helm, the Hammerhand!
@@ -586,9 +957,21 @@ N:39:of Dor-Lomin
 I:32:7:4
 W:40:12:75:300000
 P:8:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_BLIND | 
-F:LITE1 | SEE_INVIS | ESP_DRAGON | ESP_THUNDERLORD | ACTIVATE
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_DRAGON
+F:ESP_THUNDERLORD
+F:HIDE_TYPE
+F:LITE1
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:STR
 a:GORLIM
 D:The legendary dragon helm of Turin Turambar, an object of dread to the 
 D:servants of Morgoth.
@@ -599,8 +982,12 @@ N:40:'Holhenneth'
 I:32:5:2
 W:20:5:75:100000
 P:5:1d3:0:0:10
-F:INT | WIS | SEARCH | HIDE_TYPE | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
 a:DETECT_ALL
 D:A famous helm of forged iron granting extraordinary powers of mind and 
 D:awareness.
@@ -612,11 +999,25 @@ N:41:of Gorlim
 I:32:5:-5
 W:20:5:75:0
 P:5:1d3:25:25:10
-F:INT | WIS | SEARCH | HIDE_TYPE | SHOW_MODS |
-F:SEE_INVIS | NO_MAGIC | HEAVY_CURSE | TY_CURSE
-F:RES_DISEN | RES_FEAR | FREE_ACT | RES_ACID | RES_FIRE | RES_POIS |
-F:IM_COLD | ACTIVATE | DRAIN_HP | 
-F:TELEPORT | CURSED
+F:ACTIVATE
+F:CURSED
+F:DRAIN_HP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:NO_MAGIC
+F:RES_ACID
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:SHOW_MODS
+F:TELEPORT
+F:TY_CURSE
+F:WIS
 a:GORLIM
 D:A headpiece, gaudy and barbaric, that betrayed a warrior when he most 
 D:needed succor.
@@ -628,9 +1029,25 @@ N:42:of Gondor
 I:33:11:3
 W:40:40:30:125000
 P:0:1d1:0:0:15
-F:STR | WIS | CON | HIDE_TYPE | SPEED | RES_CONF | RES_SOUND | 
-F:RES_COLD | RES_FIRE | RES_LITE | RES_BLIND | RES_ELEC | RES_CHAOS |
-F:LITE1 | SEE_INVIS | REGEN | ACTIVATE
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STR
+F:WIS
 a:CURE_700
 D:The shining winged circlet brought by Elendil from dying Numenor, emblem of 
 D:Gondor through an age of the world.
@@ -643,11 +1060,21 @@ N:43:of Numenor
 I:33:12:3
 W:60:30:40:50000
 P:0:1d1:0:0:18
-F:INT | DEX | CHR | SEARCH | SPEED | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | RES_DARK | RES_BLIND | 
-F:RES_SHARDS | RES_SOUND | RES_LITE | RES_COLD | 
-F:LITE1 | ACTIVATE | DRAIN_MANA
-a:NUMENOR
+F:CHR
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:RES_BLIND
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:RES_SHARDS
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
 D:A crown of massive gold, set with wondrous jewels of thought and warding, 
 D:worn by the kings of ancient Numenor.  Its wearer may go into battle 
 D:always knowing what he faces - unless his own folly blinds him to the 
@@ -660,7 +1087,13 @@ N:44:'Colluin'
 I:35:1:0
 W:5:45:10:40000
 P:1:0d0:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | ACTIVATE | ESP_GOOD
+F:ACTIVATE
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
 a:COLLUIN
 D:A cape worn by a hero from Valinor, a land utterly beyond the strife 
 D:of Elements.
@@ -672,8 +1105,13 @@ N:45:'Holcolleth'
 I:35:1:2
 W:5:25:10:13000
 P:1:0d0:0:0:4
-F:INT | WIS | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:SPEED
+F:STEALTH
+F:WIS
 a:SLEEP
 D:This elven-grey mantle possesses great powers of tranquility and of 
 D:concealment, and grants the wearer the knowledge and understanding of 
@@ -686,8 +1124,15 @@ N:46:of Thingol
 I:35:1:3
 W:10:50:10:35000
 P:1:0d0:0:0:18
-F:DEX | CHR | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
 a:RECHARGE
 D:A sable-hued cloak, with glowing elven-runes to restore magic showing calm 
 D:and clear as moonlight on still water.
@@ -699,7 +1144,10 @@ N:47:of Thorongil
 I:35:1:0
 W:5:10:10:8000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_ACID | SEE_INVIS | RES_FEAR
+F:FREE_ACT
+F:RES_ACID
+F:RES_FEAR
+F:SEE_INVIS
 D:A cloak of shimmering green and brown that grants sight beyond sight and 
 D:shakes off holding magics, worn by Aragorn son of Arathorn in his youth 
 D:as he adventured under the name of Thorongil.
@@ -711,8 +1159,11 @@ N:48:'Colannon'
 I:35:1:3
 W:5:20:10:11000
 P:1:0d0:0:0:15
-F:STEALTH | SPEED | RES_NEXUS | 
-F:RES_ACID | ACTIVATE
+F:ACTIVATE
+F:RES_ACID
+F:RES_NEXUS
+F:SPEED
+F:STEALTH
 a:TELEPORT
 D:A crystal-blue cape of fine silk worn by a silent messenger of 
 D:the forces of Law. Somehow, its wearer is always able to escape 
@@ -725,8 +1176,22 @@ N:49:of Luthien
 I:35:6:2
 W:40:40:5:55000
 P:6:0d0:0:0:20
-F:INT | WIS | CHR | HIDE_TYPE | SPEED | STEALTH | INVIS | LUCK
-F:RES_ACID | RES_FIRE | RES_COLD | SPECIAL_GENE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INT
+F:INVIS
+F:LUCK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:SPELL_CONTAIN
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 a:REST_LIFE
 D:The opaque midnight folds, inset with a multitude of tiny diamonds, of 
 D:this cloak swirl around you and you feel a hint, a fragment of the 
@@ -740,8 +1205,15 @@ N:50:of Tuor
 I:35:6:4
 W:40:40:5:35000
 P:6:0d0:0:0:12
-F:STEALTH | DEX | HIDE_TYPE | INVIS | WATER_BREATH
-F:FREE_ACT | IM_ACID | SEE_INVIS | CLIMB
+F:CLIMB
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:INVIS
+F:SEE_INVIS
+F:STEALTH
+F:WATER_BREATH
 D:From the ruin of Gondolin did Tuor escape, through secret ways and travail, 
 D:shielded by his cloak from a multitude of hostile eyes.
 
@@ -751,7 +1223,10 @@ N:51:of Azaghal
 I:23:5:0
 W:15:30:30:40000
 P:0:2d5:12:14:0
-F:KILL_DRAGON | IM_FIRE | ESP_DRAGON | RES_FEAR
+F:ESP_DRAGON
+F:IM_FIRE
+F:KILL_DRAGON
+F:RES_FEAR
 D:The weapon of Azaghal when he wounded Glaurung.  It is deadly 
 D:when fighting dragons and is said to make the breaths of fire 
 D:completely harmless.
@@ -763,8 +1238,11 @@ N:52:'Cambeleg'
 I:31:1:2
 W:10:6:5:36000
 P:1:0d0:8:8:15
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | SHOW_MODS
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:STR
 D:A hero's handgear that lends great prowess in battle.
 
 
@@ -774,8 +1252,12 @@ N:53:'Cammithrim'
 I:31:1:0
 W:10:3:5:30000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_LITE | SUST_CON | LITE1 | ACTIVATE
+F:ACTIVATE
+F:FREE_ACT
+F:LITE1
+F:RES_LITE
 F:SPECIAL_GENE
+F:SUST_CON
 a:BO_MISS_1
 D:These gloves glow so brightly as to light the way for their owner and cast 
 D:magical bolts with great frequency.
@@ -787,7 +1269,10 @@ N:54:'Paurhach'
 I:31:2:0
 W:10:5:25:15000
 P:2:1d1:0:0:15
-F:RES_FIRE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:RES_FIRE
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:BO_FIRE_1
 D:A fiery set of gauntlets that can even shoot fire from the user's 
 D:hands.
@@ -799,8 +1284,13 @@ N:55:'Paurnimmen'
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_COLD | ACTIVATE
-F:SUST_CON | CON | REGEN | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:REGEN
+F:RES_COLD
+F:SPELL_CONTAIN
+F:SUST_CON
+F:WIELD_CAST
 a:BO_COLD_1
 D:A set of handgear so icy as to be able to fire frost bolts.
 
@@ -811,7 +1301,10 @@ N:56:'Pauraegen'
 I:31:2:0
 W:10:5:25:11000
 P:2:1d1:0:0:15
-F:RES_ELEC | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:RES_ELEC
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:BO_ELEC_1
 D:A set of handgear with sparks surrounding it, able to fire 
 D:bolts of electricity.
@@ -823,7 +1316,10 @@ N:57:'Paurnen'
 I:31:2:0
 W:10:5:25:12000
 P:2:1d1:0:0:15
-F:RES_ACID | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:RES_ACID
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:BO_ACID_1
 D:A set of handgear so corrosive that it may fire bolts of acid.
 
@@ -834,9 +1330,22 @@ N:58:'Camlost'
 I:31:2:-3
 W:10:20:25:0
 P:2:1d1:-11:-12:0
-F:STR | DEX | HIDE_TYPE | DRAIN_MANA | 
-F:RES_POIS | IM_FIRE | IM_COLD | RES_DISEN | RES_NETHER | FREE_ACT | 
-F:AGGRAVATE | SHOW_MODS | HEAVY_CURSE | TY_CURSE | TELEPORT | CURSED
+F:AGGRAVATE
+F:CURSED
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_FIRE
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SHOW_MODS
+F:STR
+F:TELEPORT
+F:TY_CURSE
 D:A pair of gauntlets that sap combat ability, named after the empty hand 
 D:of Beren that once clasped a Silmaril.
 
@@ -847,8 +1356,14 @@ N:59:of Fingolfin
 I:31:5:4
 W:40:15:40:110000
 P:5:1d1:10:10:20
-F:DEX | HIDE_TYPE | LUCK
-F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RANDOM_POWER
+F:RES_ACID
+F:SHOW_MODS
 a:BO_MISS_2
 Z:magic missile
 D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who gave 
@@ -861,8 +1376,10 @@ N:60:of Feanor
 I:30:3:15
 W:40:120:40:300000
 P:3:1d1:0:0:20
-F:SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SPEED
 a:SPEED
 D:This wondrous pair of leather boots once sped Feanor, creator of the 
 D:Silmarils and the mightiest of the Eldar, along the Grinding Ice and to 
@@ -875,9 +1392,16 @@ N:61:'Dal-i-thalion'
 I:30:2:5
 W:10:25:20:40000
 P:2:1d1:0:0:15
-F:DEX | HIDE_TYPE | CHR | SUST_CHR |
-F:ACTIVATE | FREE_ACT |
-F:RES_NETHER | RES_CHAOS | RES_CONF | SUST_CON
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_CHAOS
+F:RES_CONF
+F:RES_NETHER
+F:SUST_CHR
+F:SUST_CON
 a:CURE_POISON
 D:A pair of high-laced shoes, strong against the powers of corruption and 
 D:withering, that grant the wearer extraordinary agility.
@@ -889,7 +1413,13 @@ N:62:of Thror
 I:30:6:3
 W:30:25:80:15000
 P:6:1d1:0:0:20
-F:STR | CON | HIDE_TYPE | SPEED | RES_FEAR | CLIMB
+F:CLIMB
+F:CON
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_FEAR
+F:SPEED
+F:STR
 D:Sturdy footwear of leather and steel as enduring as the long-suffering 
 D:Dwarven King-in-exile who wore them.  Of dwarven make, these boots will
 D:make their wearer completely at home in the mountains.
@@ -907,9 +1437,20 @@ N:63:of Bard
 I:17:2:0
 W:55:30:2:50000
 P:0:8d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | KILL_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DRAGON
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:Deadliest of arrows, imbued with elemental strength, this shaft is 
 D:feared especially by the wyrmkin.
 
@@ -920,8 +1461,17 @@ N:64:of Maedhros
 I:23:5:3
 W:15:30:30:22500
 P:0:2d5:12:15:0
-F:INT | DEX | HIDE_TYPE | SPEED | SPECIAL_GENE
-F:SLAY_TROLL | SLAY_GIANT | FREE_ACT | SEE_INVIS | SHOW_MODS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RES_OR_POWER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:SPEED
 D:A short thrusting blade with a large guard worn by Maedhros the Tall, 
 D:eldest son of Feanor, and wielded with his left hand after the loss of 
 D:his right hand in the pits of Thangorodrim.
@@ -933,10 +1483,19 @@ N:65:'Angrist'
 I:23:4:4
 W:20:80:12:125000
 P:0:2d4:10:15:5
-F:DEX | HIDE_TYPE | STEALTH | SEARCH | BRAND_POIS | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | BRAND_ACID |
-F:FREE_ACT | RES_DARK | SUST_DEX | SEE_INVIS |
+F:BRAND_ACID
+F:BRAND_POIS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:SUST_DEX
 D:Forged from meteoric iron, this long chopping dagger slices through 
 D:ordinary metal as easily as its title, "Iron Cleaver", suggests.
 
@@ -947,7 +1506,13 @@ N:66:'Narthanc'
 I:23:4:0
 W:4:100:12:12000
 P:0:1d4:4:6:0
-F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS | LITE1 | LEVELS
+F:ACTIVATE
+F:BRAND_FIRE
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_FIRE
+F:SHOW_MODS
 a:BO_FIRE_1
 D:A fiery dagger finely balanced for deadly throws.
 
@@ -958,7 +1523,12 @@ N:67:'Nimthanc'
 I:23:4:0
 W:3:100:12:11000
 P:0:1d4:4:6:0
-F:BRAND_COLD | RES_COLD | ACTIVATE | SHOW_MODS | LEVELS
+F:ACTIVATE
+F:BRAND_COLD
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_COLD
+F:SHOW_MODS
 a:BO_COLD_1
 D:A frosty dagger finely balanced for deadly throws.
 
@@ -969,7 +1539,12 @@ N:68:'Dethanc'
 I:23:4:0
 W:5:100:12:13000
 P:0:1d4:4:6:0
-F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS | LEVELS
+F:ACTIVATE
+F:BRAND_ELEC
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_ELEC
+F:SHOW_MODS
 a:BO_ELEC_1
 D:A dagger covered in sparks and finely balanced for deadly throws.
 
@@ -980,7 +1555,12 @@ N:69:of Rilia
 I:23:4:0
 W:5:40:12:35000
 P:0:2d4:4:3:0
-F:SLAY_ORC | RES_POIS | RES_DISEN | ACTIVATE | SHOW_MODS | BRAND_POIS
+F:ACTIVATE
+F:BRAND_POIS
+F:RES_DISEN
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ORC
 a:BA_POIS_1
 D:A large stiletto dagger that glistens with odourless poison, to which the 
 D:wearer seems oddly immune.
@@ -992,10 +1572,18 @@ N:70:'Belangil'
 I:23:4:2
 W:10:40:12:50000
 P:0:2d4:6:9:0
-F:DEX | HIDE_TYPE | SPEED | BLOWS |
-F:BRAND_COLD | RES_COLD |
-F:SEE_INVIS | SLOW_DIGEST | REGEN |
-F:ACTIVATE | SHOW_MODS | BRAND_POIS
+F:ACTIVATE
+F:BLOWS
+F:BRAND_COLD
+F:BRAND_POIS
+F:DEX
+F:HIDE_TYPE
+F:REGEN
+F:RES_COLD
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
 a:BELANGIL
 D:A frosty dagger surrounded in a nimbus of ice with a hilt of elk horn and 
 D:an edge to wound the wind.
@@ -1007,11 +1595,22 @@ N:71:'Calris'
 I:23:21:5
 W:30:15:140:100000
 P:0:5d4:-20:20:0
-F:CON | HIDE_TYPE | DRAIN_HP | 
-F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN | 
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | ESP_DRAGON | ESP_DEMON
+F:AGGRAVATE
 F:AUTO_CURSE
+F:CON
 F:COULD2H
+F:CURSED
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_DRAGON
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
 f:COULD2H
 D:This sword has runes of power incised on its ornate hilt and a single 
 D:blood channel that gleams coldly blue as you grasp this mighty weapon of 
@@ -1024,13 +1623,28 @@ N:72:'Aranruth'
 I:23:16:4
 W:20:45:150:125000
 P:0:3d5:20:12:0
-F:STR | DEX | CON | SUST_CON | SUST_STR
-F:REGEN | FREE_ACT | SEE_INVIS |
-F:RES_CHAOS | RES_NETHER | HOLD_LIFE | RES_FEAR |
-F:RES_COLD |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD |
-F:BRAND_COLD |
-F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED
+F:BLESSED
+F:BRAND_COLD
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_CHAOS
+F:RES_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The beautiful sword of Thingol with a hilt of gold and silver inlay, 
 D:glistening icily enough to freeze the hearts of demons.  You feel supple 
 D:and lightfooted as you hold it.
@@ -1042,9 +1656,20 @@ N:73:'Glamdring'
 I:23:16:1
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | HIDE_TYPE | BLESSED | SLAY_DEMON | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_ORC | RES_FIRE | RES_LITE | LITE1 | 
-F:SLOW_DIGEST | SHOW_MODS | ESP_ORC | SPECIAL_GENE |
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
+F:SPECIAL_GENE
 D:This fiery, shining blade earned its sobriquet "Foe-Hammer" from dying orcs 
 D:who dared to come near hidden Gondolin.
 
@@ -1055,10 +1680,22 @@ N:74:'Aeglin'
 I:23:16:4
 W:20:90:150:95000
 P:0:2d5:12:16:0
-F:SEARCH | BLESSED | LITE1 | HIDE_TYPE | 
-F:BRAND_ELEC | SLAY_ORC | SLAY_GIANT | SLAY_TROLL | RES_FEAR |
-F:RES_ELEC | RES_FIRE | RES_BLIND | ESP_ORC | ESP_GIANT | ESP_TROLL | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BLESSED
+F:BRAND_ELEC
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:LITE1
+F:RES_BLIND
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
 D:Like unto Orcrist and Glamdring, and like them long lost, this sword is 
 D:continually coved in tiny arcs of captive lightning that flash and dance 
 D:eerily in the globe of light they create.
@@ -1070,9 +1707,20 @@ N:75:'Orcrist'
 I:23:16:3
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | ESP_ORC | SLAY_DRAGON | ESP_DRAGON | RES_COLD | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_ORC | RES_COLD | LITE1 | RES_DARK | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BRAND_COLD
+F:ESP_DRAGON
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_COLD
+F:RES_COLD
+F:RES_DARK
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
 D:This coldly gleaming blade is called simply "Biter", by orcs who came to 
 D:know its power all too well.
 
@@ -1083,10 +1731,23 @@ N:76:'Gurthang'
 I:23:25:2
 W:30:30:200:100000
 P:0:3d6:13:17:0
-F:STR | HIDE_TYPE | VORPAL | ESP_DRAGON | DRAIN_HP | 
-F:RES_FIRE | RES_POIS | BRAND_FIRE | BRAND_POIS | 
-F:KILL_DRAGON | SLAY_TROLL | FREE_ACT | SLOW_DIGEST | REGEN | SHOW_MODS
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_HP
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:STR
+F:VORPAL
 f:MUST2H
 D:A giant sword once wielded by mighty Turin, and a great dragonbane which 
 D:bathed in Glaurung's blood:  but beware, it will drink the blood of those 
@@ -1099,11 +1760,29 @@ N:77:'Zarcuthra'
 I:23:25:4
 W:30:180:250:205000
 P:0:4d6:19:21:0
-F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | DRAIN_MANA | 
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_FIRE |
-F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:RES_FIRE | RES_CHAOS | FREE_ACT | SEE_INVIS | AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:STR
+F:VORPAL
 f:MUST2H
 D:Dark and deadly runes stand stark against the naked steel of this awesome 
 D:weapon, and you feel a stunning power of slaying and rending as you 
@@ -1116,10 +1795,25 @@ N:78:'Mormegil'
 I:23:33:2
 W:30:15:250:0
 P:0:6d7:0:0:-20
-F:SPEED | IM_FIRE | RES_FIRE | BRAND_FIRE | RES_DISEN | RES_FEAR |
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | LEVELS | TY_CURSE | 
-F:BLOWS | SLAY_DRAGON | RES_CHAOS | ANTIMAGIC_50 | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP
+F:AGGRAVATE
+F:ANTIMAGIC_50
+F:BLOWS
+F:BRAND_FIRE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:HEAVY_CURSE
+F:IM_FIRE
+F:LEVELS
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SPEED
+F:TY_CURSE
 D:A foul, twisted sword with blackened spines and knobs, whose very name is a 
 D:curse upon the lips of Elves and Men.
 
@@ -1130,9 +1824,17 @@ N:79:'Gondricam'
 I:23:12:3
 W:20:8:110:28000
 P:0:1d7:10:11:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:DEX
+F:FEATHER
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
 D:Famed sea-defender of Lebennin.  A short, slightly curved chopping blade  
 D:with a perfect edge shining cleanly in the sun, an object of hate to the 
 D:men of Umbar who met it in combat.
@@ -1144,9 +1846,18 @@ N:80:'Crisdurian'
 I:23:28:0
 W:40:15:260:111000
 P:0:4d5:18:19:0
-F:SLAY_DRAGON | SLAY_EVIL | SLAY_UNDEAD | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS | WOUNDING
+F:BRAND_POIS
 F:MUST2H
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:VORPAL
+F:WOUNDING
 f:MUST2H
 D:A giant's weapon, with a long blade tall and straight thrusting out from a 
 D:massive double-pronged hilt.  On its blade are written doomspells against 
@@ -1159,9 +1870,13 @@ N:81:'Aglarang'
 I:23:20:5
 W:35:25:50:40000
 P:0:8d4:0:0:0
-F:DEX | TUNNEL | SPEED | HIDE_TYPE | 
-F:SUST_DEX | SHOW_MODS
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SPEED
+F:SUST_DEX
+F:TUNNEL
 f:COULD2H
 D:An utterly perfect, cleanly chiselled sword, with a edge that effortlessly 
 D:slices rock and bone, and spells to render the wearer lithe and nimble.  It 
@@ -1174,10 +1889,24 @@ N:82:'Ringil'
 I:23:17:10
 W:20:120:130:300000
 P:0:4d5:22:25:0
-F:SPEED | HIDE_TYPE | RES_FEAR | BLESSED | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_UNDEAD | KILL_DEMON | SLAY_TROLL | 
-F:FREE_ACT | RES_COLD | RES_LITE | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_FEAR
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPEED
 a:BA_COLD_2
 D:The weapon of Fingolfin, High King of the Noldor; it shines like a column 
 D:of ice lit by light unquenchable.  Morgoth came but unwillingly to meet it 
@@ -1190,10 +1919,27 @@ N:83:'Anduril'
 I:23:17:4
 W:20:40:130:100000
 P:0:3d5:10:15:5
-F:STR | DEX | HIDE_TYPE | RES_FEAR | FREE_ACT | BLESSED | LUCK
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_FIRE | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS | LITE1
-F:RES_DISEN | SPECIAL_GENE
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:DEX
+F:FREE_ACT
+F:FREE_ACT
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:STR
+F:SUST_DEX
 a:BA_FIRE_1
 D:The famed "Flame of the West", the sword that was broken and is forged 
 D:again.  It glows with the essence of fire, its wearer is mighty in combat, 
@@ -1207,10 +1953,23 @@ N:84:'Anguirel'
 I:23:17:2
 W:20:30:130:40000
 P:0:2d5:8:12:0
-F:STR | CON | SPEED | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_ELEC | SLAY_DEMON | FREE_ACT | RES_ELEC | 
-F:RES_LITE | RES_DARK | SEE_INVIS | SHOW_MODS | VORPAL | WOUNDING
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:BRAND_ELEC
+F:CON
+F:CURSED
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Forged of black galvorn by the Dark-Elven smith Eol, this blade has the 
 D:living lightning trapped inside.
 
@@ -1221,8 +1980,17 @@ N:85:'Elvagil'
 I:23:17:2
 W:20:8:130:20000
 P:0:2d5:5:7:0
-F:DEX | CHR | STEALTH | HIDE_TYPE | ESP_ORC | ESP_TROLL
-F:SLAY_TROLL | SLAY_ORC | FEATHER | SEE_INVIS | SHOW_MODS
+F:CHR
+F:DEX
+F:ESP_ORC
+F:ESP_TROLL
+F:FEATHER
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
 D:The "Singing Blade", whose wearer can slay Orcs and Trolls in the hidden 
 D:and secret places of the earth.
 
@@ -1233,7 +2001,11 @@ N:86:'Forasgil'
 I:23:7:0
 W:15:8:40:15000
 P:0:1d6:12:19:0
-F:SLAY_ANIMAL | BRAND_COLD | RES_COLD | RES_LITE | SHOW_MODS
+F:BRAND_COLD
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A slender, tapered blade whose wielder strikes icy blows with deadly 
 D:accuracy.
 
@@ -1244,9 +2016,17 @@ N:87:'Careth Asdriag'
 I:23:11:2
 W:15:8:50:25000
 P:0:2d7:6:8:0
-F:DEX | BLOWS | SPEED | CON | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SHOW_MODS | ESP_ANIMAL
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ANIMAL
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
 D:An heirloom of the Lords of Rhun far to the east, and a name of 
 D:dismay to creatures natural and unnatural.
 
@@ -1257,10 +2037,25 @@ N:88:'Sting'
 I:23:8:2
 W:20:205:75:100000
 P:0:1d6:7:8:0
-F:STR | DEX | CON | BLOWS | SPEED | LEVELS | 
-F:ESP_ORC | ESP_UNDEAD | ESP_SPIDER | 
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_ORC | SLAY_ANIMAL | LITE1 | 
-F:FREE_ACT | RES_LITE | SEE_INVIS | SHOW_MODS | 
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ORC
+F:ESP_SPIDER
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
 D:"I will give you a name, and I shall call you Sting."  The perfect size 
 D:for Bilbo, and stamped forever by the courage he found in Mirkwood, this 
 D:sturdy little blade grants the wearer combat prowess and survival 
@@ -1273,11 +2068,21 @@ N:89:'Haradekket'
 I:23:18:2
 W:20:8:130:111111
 P:0:2d5:9:11:0
-F:INT | WIS | BLOWS |
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DRAGON | SLAY_DEMON |
-F:RES_CHAOS | RES_DISEN | RES_NEXUS | 
-F:SEE_INVIS | BLESSED |
+F:BLESSED
+F:BLOWS
+F:INT
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:WIS
 D:A damascened scimitar that seems wondrously easy to hold.  Famed in song as 
 D:the "Sickle of Harad", and a deadly foe to the undead.
 
@@ -1288,8 +2093,14 @@ N:90:'Gilettar'
 I:23:10:2
 W:20:8:80:35000
 P:0:1d7:3:7:0
-F:BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLOW_DIGEST | REGEN | SHOW_MODS | SEE_INVIS | RES_DISEN
+F:BLOWS
+F:HIDE_TYPE
+F:REGEN
+F:RES_DISEN
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
 D:A stubby blade worn by Beren, whose horn sounded of old in the glades of 
 D:Brethil.
 
@@ -1300,10 +2111,27 @@ N:91:'Doomcaller'
 I:23:30:0
 W:70:25:180:250000
 P:0:6d5:18:28:-50
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_COLD | SLAY_TROLL | 
-F:SLAY_ORC | FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_CHAOS | SEE_INVIS | ESP_EVIL | AGGRAVATE | SHOW_MODS | 
-F:CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | SPECIAL_GENE
+F:AGGRAVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:ESP_EVIL
+F:FREE_ACT
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:VORPAL
 D:This weapon of wrath, cursed with a violent anger, dives hungrily 
 D:into the flesh of its enemies. It gathers shadows of death into its 
 D:owner as they inflict wounds that will never heal.
@@ -1315,8 +2143,16 @@ N:92:'Vorpal Blade'
 I:23:17:2
 W:50:30:150:250000
 P:0:5d5:32:32:0
-F:VORPAL | SLAY_EVIL | WOUNDING
-F:FREE_ACT | SEE_INVIS | SLOW_DIGEST | REGEN | SPEED | STR | DEX
+F:DEX
+F:FREE_ACT
+F:REGEN
+F:SEE_INVIS
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:"One, two! One, two!  And through, and through, the vorpal blade 
 D:went snicker-snack!"
 
@@ -1327,8 +2163,15 @@ N:93:of Theoden
 I:22:10:3
 W:20:15:180:40000
 P:0:2d6:8:10:0
-F:WIS | CON | HIDE_TYPE | 
-F:SLAY_DRAGON | ESP_EVIL | ESP_UNDEAD | SLOW_DIGEST | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:CON
+F:ESP_EVIL
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WIS
 a:DRAIN_2
 D:The narrow axe head of this weapon, finely balanced by a crow's beak, 
 D:would pierce even the armour of Smaug, and its wielder becomes aware of 
@@ -1341,8 +2184,10 @@ N:94:of Pain
 I:22:13:0
 W:30:155:190:50000
 P:0:9d6:0:30:0
-F:SHOW_MODS | LEVELS | DRAIN_MANA
 F:COULD2H
+F:DRAIN_MANA
+F:LEVELS
+F:SHOW_MODS
 f:COULD2H
 D:The massive chopper that crowns this glaive glows blood-red and black; 
 D:fell spells of annihilation swirl and dance as you swing death's myrmidon 
@@ -1355,10 +2200,18 @@ N:95:'Osondir'
 I:22:15:3
 W:20:8:190:22000
 P:0:3d5:6:9:0
-F:CHR | HIDE_TYPE | 
-F:BRAND_FIRE | SLAY_UNDEAD | SLAY_GIANT | RES_FIRE | RES_SOUND | 
-F:FEATHER | SEE_INVIS | SHOW_MODS | ESP_GIANT
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_UNDEAD
 f:COULD2H
 D:Lordly and tall did Osondir stand against the wrath of giants, and 
 D:clear-eyed in barrows fell, wielding a halberd glowing ruby red.
@@ -1370,10 +2223,20 @@ N:96:'Til-i-arc'
 I:22:8:2
 W:20:15:160:32000
 P:0:2d5:10:12:10
-F:INT | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | ESP_GIANT
-F:RES_FIRE | RES_COLD | SUST_INT | SLOW_DIGEST | SHOW_MODS |
+F:BRAND_COLD
+F:BRAND_FIRE
 F:COULD2H
+F:ESP_GIANT
+F:HIDE_TYPE
+F:INT
+F:RES_COLD
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:SUST_INT
 f:COULD2H
 D:Within this long thrusting spear lie the spirits of frost giants and fire 
 D:demons, who war forever, trapped by magely spells.
@@ -1385,11 +2248,24 @@ N:97:'Aeglos'
 I:22:2:4
 W:15:45:50:180000
 P:0:3d6:15:25:5
-F:DEX | WIS | HIDE_TYPE |
-F:BRAND_COLD | BRAND_ELEC | LITE1 | 
-F:SLAY_TROLL | SLAY_ORC | SLAY_GIANT | KILL_UNDEAD | 
-F:FREE_ACT | RES_COLD | RES_ELEC | RES_LITE |
-F:SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS |
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:LITE1
+F:RES_COLD
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:WIS
 a:BA_ELEC_2
 D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of 
 D:Elves, against which all the foul corruptions of Sauron dashed in vain.
@@ -1401,13 +2277,28 @@ N:98:of Orome
 I:22:2:4
 W:15:45:50:77777
 P:0:4d6:15:15:0
-F:INT | WIS | SPEED | TUNNEL | INFRA | HIDE_TYPE | SEARCH |
-F:BRAND_FIRE |
-F:SLAY_GIANT | SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | SLAY_DRAGON |
-F:RES_FIRE | RES_LITE | HOLD_LIFE | RES_FEAR |
-F:FEATHER | ESP_GIANT
-F:SEE_INVIS |
-F:ACTIVATE | BLESSED | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INFRA
+F:INT
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_UNDEAD
+F:SPEED
+F:TUNNEL
+F:WIS
 a:STONE_MUD
 D:The thrusting spear of wise Orome the Vala, strong against giants of frost, 
 D:which can melt rock or flesh with ease.
@@ -1419,8 +2310,16 @@ N:99:'Nimloth'
 I:22:2:3
 W:15:12:50:30000
 P:0:1d6:11:13:0
-F:STEALTH | RES_DARK | INFRA | SPEED | BLESSED | 
-F:BRAND_COLD | SLAY_UNDEAD | RES_COLD | SEE_INVIS | SHOW_MODS
+F:BLESSED
+F:BRAND_COLD
+F:INFRA
+F:RES_COLD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_UNDEAD
+F:SPEED
+F:STEALTH
 D:A thin spike of thrice-forged steel caps a straight sylvan shaft cut from 
 D:a legendary tree; spells to break the will of the undead and strike cold 
 D:fear into the hearts of foes lie on this perfectly balanced spear.
@@ -1432,9 +2331,17 @@ N:100:of Eorlingas
 I:22:20:2
 W:20:23:360:55000
 P:0:3d8:3:21:0
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
 F:MUST2H
+F:RES_FEAR
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
+F:STR
 f:MUST2H
 D:"Forth Eorlingas!"  To the field of Cormallen came Eorl the Young 
 D:to save beleaguered Gondor, and from his lance fled massive trolls 
@@ -1447,11 +2354,26 @@ N:101:of Durin
 I:24:25:3
 W:30:90:230:150000
 P:0:4d4:10:20:15
-F:STR | CON | TUNNEL | HIDE_TYPE | ESP_EVIL | RES_FEAR | 
-F:SLAY_DRAGON | KILL_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_FIRE | RES_LITE | RES_DARK | RES_CHAOS | SHOW_MODS | 
-F:BRAND_ACID | BRAND_FIRE
+F:BRAND_ACID
+F:BRAND_FIRE
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
 F:MUST2H
+F:RES_ACID
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 f:MUST2H
 D:The twin massive axe heads of this ancient demon's dread gleam with 
 D:mithril inlay, which tell sagas of endurance, invoking the powers of 
@@ -1464,10 +2386,25 @@ N:102:of Eonwe
 I:24:25:2
 W:30:120:230:200000
 P:0:4d4:15:18:8
-F:STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | KILL_DEMON | SLAY_UNDEAD | ESP_NONLIVING
-F:SLAY_ORC | FREE_ACT | IM_COLD | SEE_INVIS | ACTIVATE | 
-F:BLESSED | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:CHR
+F:CON
+F:DEX
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:KILL_DEMON
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:STR
+F:WIS
 a:MASS_GENO
 D:The axe of Eonwe, leader of the Hosts of the West before the gates of 
 D:Thangorodrim, strikes with icy wrath at the undead, disperses hosts of 
@@ -1480,11 +2417,25 @@ N:103:of Balli Stonehand
 I:22:22:3
 W:30:15:170:90000
 P:0:3d8:8:11:5
-F:STR | CON | STEALTH | HIDE_TYPE | ESP_NONLIVING
-F:SLAY_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_BLIND | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:CON
 F:COULD2H
+F:ESP_NONLIVING
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:STR
 f:COULD2H
 D:The twin blades of this weapon were forged in Belegost, and powerful forces 
 D:to resist and endure lie ready for he who shall wield it once more.
@@ -1496,8 +2447,13 @@ N:104:'Lotharang'
 I:22:22:1
 W:30:15:170:21000
 P:0:2d8:4:3:0
-F:STR | DEX | HIDE_TYPE | 
-F:SLAY_TROLL | SLAY_ORC | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 a:CURE_MW
 D:A superbly crafted double-bladed axe that slays the creatures of earth and 
 D:allows rapid recovery from their blows.
@@ -1509,10 +2465,17 @@ N:105:of the Dwarves
 I:22:28:10
 W:30:8:250:80000
 P:0:3d8:12:17:0
-F:SLAY_EVIL | TUNNEL | INFRA | SEARCH | SLAY_GIANT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_FEAR |
-F:SHOW_MODS
 F:COULD2H
+F:INFRA
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:TUNNEL
 f:COULD2H
 D:A massive axe with twin razor-sharp heads, so large that it usually 
 D:requires two hands to wield, intricately engraved in gold with spells 
@@ -1525,10 +2488,15 @@ N:106:'Barukkheled'
 I:24:11:3
 W:20:8:160:50000
 P:0:2d6:13:19:0
-F:CON | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:SEE_INVIS | SHOW_MODS
+F:CON
 F:COULD2H
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
 f:COULD2H
 D:A royal heirloom of the southern coast, strong in combat against evil 
 D:creatures of the earth.
@@ -1540,10 +2508,19 @@ N:107:of Wrath
 I:22:5:2
 W:15:35:300:90000
 P:0:3d8:16:18:0
-F:STR | DEX | HIDE_TYPE | CHAOTIC | DRAIN_MANA | 
-F:SLAY_EVIL | KILL_UNDEAD | RES_LITE | RES_DARK | SEE_INVIS | 
-F:BLESSED | SHOW_MODS
+F:BLESSED
+F:CHAOTIC
 F:COULD2H
+F:DEX
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STR
 f:COULD2H
 D:A massive triple-pronged spear, so great it normally requires two hands to 
 D:wield, evoking the spirit of Osse who with it pierced legions of 
@@ -1556,10 +2533,22 @@ N:108:of Ulmo
 I:22:5:4
 W:30:90:70:120000
 P:0:4d8:15:19:0
-F:DEX | HIDE_TYPE | 
-F:SLAY_DRAGON | SLAY_ANIMAL | FREE_ACT | HOLD_LIFE | IM_ACID | 
-F:RES_NETHER | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:BLESSED | SHOW_MODS | WATER_BREATH
+F:ACTIVATE
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ACID
+F:RANDOM_POWER
+F:REGEN
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WATER_BREATH
 a:TELE_AWAY
 D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightiest of all the 
 D:powers of good save Manwe himself, Ulmo laughs in scorn at the dread powers 
@@ -1572,10 +2561,19 @@ N:109:'Avavir'
 I:22:17:3
 W:40:8:250:18000
 P:0:5d3:8:8:10
-F:DEX | CHR | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | FREE_ACT | RES_FIRE | RES_COLD | 
-F:RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_COLD
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
 f:COULD2H
 a:RECALL
 D:With elemental powers whose struggles turn this weapon red and purest 
@@ -1589,9 +2587,26 @@ N:110:of the Dawn
 I:23:17:3
 W:40:160:130:250000
 P:0:3d5:20:20:0
-F:ACTIVATE | BRAND_FIRE | FREE_ACT | RES_FIRE | INFRA | LEVELS |
-F:SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD | SLAY_DEMON | VORPAL | CLONE |
-F:CHR | SUST_CHR | RES_FEAR | RES_LITE | RES_BLIND | REGEN | SHOW_MODS
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:FREE_ACT
+F:INFRA
+F:LEVELS
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_BLIND
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUST_CHR
+F:VORPAL
 a:DAWN
 D:Forged in the farthest East by a race of mighty spellcasters, this 
 D:shiny pale sword gleams with the rays of rising sun as you invoke 
@@ -1604,11 +2619,28 @@ N:111:'Grond'
 I:21:50:2
 W:100:1:1000:500000
 P:0:9d9:25:25:10
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | IMPACT | KILL_UNDEAD | NO_MAGIC |
-F:KILL_DEMON | SLAY_TROLL | SLAY_ORC | RES_ACID | RES_ELEC | RES_FIRE | 
-F:RES_COLD | SEE_INVIS | ESP_ALL | AGGRAVATE | SHOW_MODS | INSTA_ART |
-F:LEVELS | ACTIVATE | SPECIAL_GENE
+F:ACTIVATE
+F:AGGRAVATE
+F:ESP_ALL
+F:IMPACT
+F:INSTA_ART
+F:KILL_DEMON
+F:KILL_DRAGON
+F:KILL_UNDEAD
+F:LEVELS
 F:MUST2H
+F:NO_MAGIC
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 f:MUST2H
 a:GROND
 D:The mighty Hammer of the Underworld, blackened by doomspells of shattering, 
@@ -1621,10 +2653,15 @@ N:112:'Totila'
 I:21:13:2
 W:20:8:150:55000
 P:0:3d6:6:8:0
-F:STEALTH | 
-F:SLAY_EVIL | BRAND_FIRE | RES_FIRE | RES_CONF | ACTIVATE | 
-F:SHOW_MODS | LITE1
+F:ACTIVATE
+F:BRAND_FIRE
 F:COULD2H
+F:LITE1
+F:RES_CONF
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STEALTH
 f:COULD2H
 a:CONFUSE
 D:A flail whose head befuddles those who stare as you whirl it around, and 
@@ -1637,10 +2674,20 @@ N:113:'Thunderfist'
 I:21:18:4
 W:45:38:300:160000
 P:0:3d6:5:18:0
-F:STR | CON | HIDE_TYPE | RES_FEAR | 
-F:SLAY_ANIMAL | BRAND_FIRE | BRAND_ELEC | SLAY_TROLL | SLAY_ORC | 
-F:RES_ELEC | RES_FIRE | RES_DARK | SHOW_MODS |
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
 F:MUST2H
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 D:The long-lost weapon of Kzurin, Dwarven champion of ancient Belegost, 
 D:with runes of strength in its handle, and flames and sparks that roar and 
@@ -1653,9 +2700,15 @@ N:114:'Bloodspike'
 I:21:12:4
 W:20:30:150:30000
 P:0:2d6:8:22:0
-F:STR | HIDE_TYPE | BRAND_POIS | 
-F:SLAY_ANIMAL | SLAY_TROLL | SLAY_ORC | RES_NEXUS | SEE_INVIS | 
+F:BRAND_POIS
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:You feel strong and firm of foot as you whip the chain-suspended spiked orb 
 D:around - and bathe it in the blood of your foes.
 
@@ -1666,7 +2719,11 @@ N:115:'Firestar'
 I:21:12:0
 W:20:100:150:35000
 P:0:2d6:5:7:2
-F:BRAND_FIRE | IM_FIRE | ACTIVATE | SHOW_MODS | LITE1
+F:ACTIVATE
+F:BRAND_FIRE
+F:IM_FIRE
+F:LITE1
+F:SHOW_MODS
 a:FIRESTAR
 D:A famed battle-lord of old, with a ruddy head, coloured as embers are that 
 D:can yet rise up in wrath.
@@ -1678,8 +2735,12 @@ N:116:'Taratol'
 I:21:5:0
 W:20:15:200:50000
 P:0:3d4:12:12:0
-F:KILL_DRAGON | BRAND_ELEC | IM_ELEC | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ELEC
 F:COULD2H
+F:IM_ELEC
+F:KILL_DRAGON
+F:SHOW_MODS
 f:COULD2H
 a:SPEED
 D:A great ridged mace that calls around you a nimbus of living lightning; 
@@ -1693,11 +2754,26 @@ N:117:of Aule
 I:21:8:4
 W:40:75:120:250000
 P:0:9d3:19:21:5
-F:WIS | TUNNEL | HIDE_TYPE | RES_FEAR | 
-F:KILL_DRAGON | SLAY_EVIL | BRAND_ELEC | SLAY_UNDEAD | SLAY_DEMON | 
-F:FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_NEXUS | 
-F:SEE_INVIS | SHOW_MODS
+F:BRAND_ELEC
 F:COULD2H
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:TUNNEL
+F:WIS
 f:COULD2H
 D:The wondrous hammer of Aule, creator of the wise Dwarven lords of old.  
 D:It bears magics of demolishing that no serpent or demon can withstand, and 
@@ -1710,9 +2786,13 @@ N:118:'Nar-i-vagil'
 I:21:3:3
 W:20:18:150:70000
 P:0:1d9:10:20:0
-F:INT | HIDE_TYPE | 
-F:SLAY_ANIMAL | BRAND_FIRE | RES_FIRE | SHOW_MODS
+F:BRAND_FIRE
 F:COULD2H
+F:HIDE_TYPE
+F:INT
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:Named for a fiery star and set with gems of great worth binding mystic 
 D:virtues of protection and thought.
@@ -1724,8 +2804,17 @@ N:119:'Eriril'
 I:21:3:4
 W:20:18:150:20000
 P:0:1d9:3:5:0
-F:INT | WIS | HIDE_TYPE | ESP_EVIL | SPELL_CONTAIN | WIELD_CAST
-F:SLAY_EVIL | RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INT
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
 a:ID_PLAIN
 D:The radiant golden staff of an Istari of legend, this wizard's companion 
 D:grants keen sight and the knowledge of many hidden things.
@@ -1737,9 +2826,24 @@ N:120:of Olorin
 I:21:3:4
 W:30:105:150:140000
 P:0:2d9:10:13:0
-F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | SPELL_CONTAIN | WIELD_CAST
-F:HOLD_LIFE | RES_FIRE | RES_NETHER | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_FIRE
+F:BRAND_FIRE
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INT
+F:RANDOM_POWER
+F:RES_FIRE
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
 a:DETECT_XTRA
 D:A staff tall and sturdy, with rough-hewn runes that invoke the element of 
 D:Earth, and which strikes down all creatures who live in the shadow of 
@@ -1752,11 +2856,25 @@ N:121:'Deathwreaker'
 I:21:20:6
 W:80:38:400:444444
 P:0:7d8:18:18:0
-F:STR | TUNNEL | HIDE_TYPE | NO_TELE | DRAIN_MANA | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_EVIL | KILL_UNDEAD | BRAND_FIRE | 
-F:IM_FIRE | RES_DARK | RES_CHAOS | RES_DISEN | AGGRAVATE |
-F:SHOW_MODS | BRAND_POIS | VAMPIRIC
+F:AGGRAVATE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IM_FIRE
+F:KILL_UNDEAD
 F:MUST2H
+F:NO_TELE
+F:RES_CHAOS
+F:RES_DARK
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:STR
+F:TUNNEL
+F:VAMPIRIC
 f:MUST2H
 D:A weapon so massive it seems beyond the strength of mortals, yet you feel 
 D:the might of giants within you as you heft it.  As you grip the handle 
@@ -1771,10 +2889,21 @@ N:122:'Turmil'
 I:21:10:4
 W:20:15:120:30000
 P:0:2d5:10:6:8
-F:WIS | INFRA | HIDE_TYPE | 
-F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | REGEN | 
-F:ACTIVATE | SHOW_MODS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:ACTIVATE
+F:BRAND_COLD
 F:COULD2H
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INFRA
+F:RANDOM_RESIST
+F:REGEN
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ORC
+F:WIS
 f:COULD2H
 a:TURMIL
 D:Wielded by the High Priest of Meneltarma, this great mace gleams coldly as 
@@ -1788,11 +2917,26 @@ N:123:of Gothmog
 I:21:2:-2
 W:20:15:120:100000
 P:0:3d6:15:16:0
-F:INT | DEX | INFRA | HIDE_TYPE | DRAIN_HP | 
-F:HEAVY_CURSE | CURSED | AGGRAVATE | 
-F:BRAND_FIRE | SLAY_ANIMAL | SLAY_DEMON | RES_FIRE | ESP_SPIDER
-F:VORPAL | RES_LITE | LITE1 | REGEN | ESP_DEMON | WOUNDING
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CURSED
+F:DEX
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_SPIDER
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:REGEN
+F:RES_FIRE
+F:RES_LITE
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:VORPAL
+F:WOUNDING
 D:With this unbearably bright whip of flame, the Balrog Gothmog has become 
 D:known for never having lost in combat.
 
@@ -1803,8 +2947,12 @@ N:124:'Belthronding'
 I:19:13:3
 W:40:20:40:35000
 P:0:0d0:20:22:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_DISEN | XTRA_SHOTS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
+F:RES_DISEN
+F:SHOW_MODS
+F:STEALTH
+F:XTRA_SHOTS
 D:The great bow of Beleg, made of black yew and strung with elven hair that 
 D:faintly shines a pale clear gold.
 
@@ -1815,8 +2963,13 @@ N:125:of Bard
 I:19:13:2
 W:30:20:40:20000
 P:0:0d0:17:19:0
-F:DEX | HIDE_TYPE | ESP_DRAGON | LUCK
-F:FREE_ACT | XTRA_MIGHT | SHOW_MODS
+F:DEX
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:SHOW_MODS
+F:XTRA_MIGHT
 D:The great yew bow of grim-faced Bard, who shot the mightiest arrow that 
 D:songs record.
 
@@ -1827,8 +2980,12 @@ N:126:'Cubragol'
 I:19:23:10
 W:50:25:110:50000
 P:0:0d0:10:14:0
-F:SPEED | HIDE_TYPE | 
-F:RES_FIRE | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:HIDE_TYPE
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:SHOW_MODS
+F:SPEED
 a:CUBRAGOL
 D:A crossbow that grants fiery speed to he who finds it, and from which 
 D:shoot bolts that blaze with flame unquenchable.
@@ -1842,11 +2999,29 @@ N:127:of Eternity
 I:6:1:12
 W:127:220:20:9000000
 P:0:1d4:-19:-19:0
-F:INT | CHR | WIS | MANA | SPELL | ACTIVATE |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | LUCK | SPECIAL_GENE
-F:SEE_INVIS | ESP_EVIL | ESP_DEMON | NEVER_BLOW | INFRA
-F:PRECOGNITION | IM_FIRE | ULTIMATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CHR
 F:COULD2H
+F:ESP_DEMON
+F:ESP_EVIL
+F:IM_FIRE
+F:INFRA
+F:INT
+F:LUCK
+F:MANA
+F:NEVER_BLOW
+F:PRECOGNITION
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPELL
+F:SPELL_CONTAIN
+F:ULTIMATE
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 a:GANDALF
 D:A simple, wooden wizard's staff.  Unremarkable in all aspects... 
@@ -1860,8 +3035,12 @@ N:128:of Beor
 I:15:4:4
 W:20:10:20:40000
 P:0:4d5:8:12:0
-F:DEX | SPEED | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:DEX
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SPEED
 D:Beor's boomerang makes its wielder as agile as the winds, 
 D:and as hard to harm.
 
@@ -1872,8 +3051,20 @@ N:129:'Glimdrir'
 I:15:4:3
 W:40:20:20:60000
 P:0:5d5:15:16:0
-F:DEX | SPEED | FREE_ACT | BRAND_POIS | SLAY_EVIL | SLAY_UNDEAD | REGEN
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SOUND | NO_TELE | CURSED
+F:BRAND_POIS
+F:CURSED
+F:DEX
+F:FREE_ACT
+F:NO_TELE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
 D:A powerful boomerang that makes one agile and fast, with a thirst for 
 D:evil and undead creatures, but demands its wielder not teleport, for fear 
 D:of desertion.
@@ -1885,9 +3076,19 @@ N:130:of Incanus
 I:36:2:3
 W:30:20:20:60000
 P:2:0d0:0:0:20
-F:INT | WIS | SEARCH | HIDE_TYPE | SPELL_CONTAIN | WIELD_CAST
-F:SUST_INT | SUST_WIS | FREE_ACT | SEE_INVIS | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 Z:weigh magic
 D:Gandalf's long, flowing robe.  It provides insight and allows the 
 D:wearer to see things not seen by all.
@@ -1899,8 +3100,13 @@ N:131:of the Thain
 I:19:2:4
 W:40:20:40:35000
 P:0:0d0:15:15:0
-F:HIDE_TYPE | DEX | CON
-F:RES_NETHER | XTRA_SHOTS | XTRA_MIGHT | SHOW_MODS
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_NETHER
+F:SHOW_MODS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was crafted by Faramir I, Thain of the Shire, just in case 
 D:the nasties of his father's stories ever dare to enter the Shire again.
 
@@ -1911,9 +3117,16 @@ N:134:'Lasher'
 I:21:2:3
 W:20:5:30:50000
 P:0:1d6:12:15:0
-F:DEX | BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLAY_ORC | BRAND_POIS | VORPAL | 
-F:RES_POIS | FREE_ACT | ESP_ORC
+F:BLOWS
+F:BRAND_POIS
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_POIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:VORPAL
 D:A powerful whip that is deadly against orcs.  It poisons your foes 
 D:and is said to go "snicker snack".
 
@@ -1924,9 +3137,19 @@ N:135:'Bullseye'
 I:17:2:0
 W:45:1:2:50000
 P:0:7d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | KILL_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DEMON
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:A powerful arrow that is feared by even the mightiest demons.
 
 
@@ -1936,7 +3159,11 @@ N:136:'Travak'
 I:16:0:0
 W:5:1:2:5000
 P:0:3d6:8:5:0
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
 D:A rounded pebble imbued with the powers of the elements.
 
 
@@ -1946,8 +3173,19 @@ N:137:of Maglor
 I:14:59:3
 W:60:10:20:100000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ESP_UNIQUE | WIELD_CAST
+F:CHR
+F:ESP_UNIQUE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:This harp that once belonged to Maglor makes those who use it seem 
 D:more forceful and convincing.  It is also said that those who have 
 D:used it found themselves walking faster, as if to an unheard beat.
@@ -1959,8 +3197,18 @@ N:138:of the Sky
 I:14:58:2
 W:40:10:15:80000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | WIELD_CAST
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:The drum is decorated with the images of the stars, the clouds, the 
 D:Sun guided by Arien and the Moon with Tilion.  It imparts to the 
 D:wearer an echo of the beauty of the sky, and protects him from the 
@@ -1974,8 +3222,17 @@ N:139:of Daeron
 I:14:59:1
 W:20:10:10:50000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | WIELD_CAST
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:A pretty harp that makes those who play it beautiful, wise and 
 D:fast.
 
@@ -1986,8 +3243,16 @@ N:140:of Erebor
 I:20:6:5
 W:50:15:200:55000
 P:0:3d4:0:0:0
-F:STR | TUNNEL | SUST_STR | HIDE_TYPE | LITE1 | ACTIVATE | CLIMB
-F:RES_CHAOS | RES_LITE | RES_DARK
+F:ACTIVATE
+F:CLIMB
+F:HIDE_TYPE
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:STR
+F:SUST_STR
+F:TUNNEL
 a:EREBOR
 D:A pick that provides a magical light by which to see while tunnelling.
 
@@ -1998,7 +3263,12 @@ N:141:of the Druedain
 I:14:58:4
 W:19:10:15:10000
 P:0:3d4:0:0:0
-F:ACTIVATE | STEALTH | SEARCH | INFRA | RES_POIS | RES_DARK | WIELD_CAST
+F:ACTIVATE
+F:INFRA
+F:RES_DARK
+F:RES_POIS
+F:STEALTH
+F:WIELD_CAST
 a:DRUEDAIN
 D:The fabled Drum of the Druedain that will protect those who play it 
 D:from darkness and poison attacks.  It also aids in the seeing of 
@@ -2011,7 +3281,11 @@ N:142:of Rohan
 I:14:60:2
 W:14:10:15:80000
 P:0:3d4:0:0:0
-F:ACTIVATE | CHR | WIS | ESP_DRAGON | WIELD_CAST
+F:ACTIVATE
+F:CHR
+F:ESP_DRAGON
+F:WIELD_CAST
+F:WIS
 a:ROHAN
 D:A horn carved from the bones of the Dragon of Ered-Mithrin, this 
 D:heirloom of the House of Eorl bestows to its user the gifts of 
@@ -2024,7 +3298,13 @@ N:143:of Helm
 I:14:60:2
 W:16:10:15:15000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | IM_COLD | RES_NETHER | RES_FEAR | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:IM_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:STR
+F:WIELD_CAST
 a:HELM
 D:Heedless of cold, fearless of darkness -- besiegers fled at the wind 
 D:of the solitary coming of King Helm Hammerhand, proclaimed by a single 
@@ -2037,7 +3317,13 @@ N:144:of Boromir
 I:14:60:3
 W:18:10:15:18000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | RES_FEAR | RES_FIRE | AGGRAVATE | WIELD_CAST
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:RES_FEAR
+F:RES_FIRE
+F:STR
+F:WIELD_CAST
 a:BOROMIR
 D:Boromir's horn gives courage and endurance to the wearer, provided he does 
 D:not wish to travel in secrecy: for it must always sound when its wielder 
@@ -2051,7 +3337,13 @@ N:145:of Gothmog
 I:22:28:-4
 W:30:8:250:30000
 P:0:3d8:14:19:0
-F:BRAND_FIRE | IM_FIRE | CHR | ACTIVATE | SHOW_MODS | CURSED | TY_CURSE
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CURSED
+F:IM_FIRE
+F:SHOW_MODS
+F:TY_CURSE
 a:AXE_GOTHMOG
 D:The black axe of Gothmog, which struck Fingon at Nirnaeth.  Mighty 
 D:spells of evil make it unsafe in any hands but those of its original wielder.
@@ -2063,7 +3355,8 @@ N:146:of Gondor
 I:17:2:0
 W:20:5:3:25000
 P:0:10d8:10:20:0
-F:SLAY_EVIL | SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
 D:An arrow that was created to rid the world of demons.
 
 
@@ -2074,13 +3367,40 @@ N:147:of Eternity
 I:23:17:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:LIFE | CON | CHR | LUCK
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:BRAND_FIRE | BRAND_COLD | BRAND_ELEC | VORPAL | IM_COLD |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_DEMON |
-F:FREE_ACT | RES_FIRE | RES_DARK | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS | BLESSED |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:A warm light bathes this translucent blade.  The power of the fates are 
 D:at the command of its wielder as the weapon passes Supreme Judgment on 
@@ -2093,8 +3413,11 @@ N:148:of Great Luck
 I:36:2:60
 W:50:120:20:60000
 P:-30:0d0:0:0:-20
-F:LUCK | HIDE_TYPE |
-F:FREE_ACT | DRAIN_HP | DRAIN_MANA
+F:DRAIN_HP
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
 D:A powerful wizard once created this robe to grant him incredible luck....
 D:It seems he forgot to wear it.
 
@@ -2105,8 +3428,12 @@ N:149:of Farmer Maggot
 I:19:2:2
 W:10:10:5:20000
 P:0:0d0:20:0:0
-F:INFRA | SEARCH | HIDE_TYPE | 
-F:XTRA_SHOTS | SHOW_MODS | ACTIVATE | SPECIAL_GENE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:XTRA_SHOTS
 a:MAGGOT
 D:This ordinary seeming leather sling has been raised to legendary 
 D:status amongst generations of hobbit children.  Farmer Maggot's 
@@ -2123,10 +3450,25 @@ N:150:of Angmar
 I:23:17:-10
 W:20:40:130:30000
 P:0:4d5:-22:-25:0
-F:SPEED | STR | WIS | CHR | ESP_UNDEAD
-F:BRAND_FIRE | SEE_INVIS | SLOW_DIGEST | FREE_ACT |
-F:VAMPIRIC | NO_TELE | AGGRAVATE | WRAITH | INVIS |
-F:CURSED | HEAVY_CURSE | DG_CURSE | SHOW_MODS | CLONE |
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:CURSED
+F:DG_CURSE
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:INVIS
+F:NO_TELE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VAMPIRIC
+F:WIS
+F:WRAITH
 D:Dark flames wreath the naked steel of the Witch-King of Angmar.  
 D:A mighty curse to all those who wield it apart from its master, 
 D:the torture of the wraithworld awaits those who dare.
@@ -2138,9 +3480,19 @@ N:151:of Feanor
 I:18:2:0
 W:127:220:130:100000
 P:0:5d5:5:6:0
-F:BRAND_COLD | BRAND_FIRE | BRAND_ELEC | BRAND_ACID | BRAND_POIS |
-F:SLAY_DRAGON | SLAY_GIANT | SLAY_TROLL | KILL_UNDEAD | SLAY_ORC |
-F:SLAY_DEMON | SLAY_EVIL | SPECIAL_GENE
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_UNDEAD
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 D:Made during the war against Morgoth by Feanor, this powerful 
 D:bolt is the bane of Morgoth's power, and has especial strength 
 D:against those foes who are already dead.
@@ -2153,11 +3505,38 @@ N:152:of Eternity
 I:19:24:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:SEE_INVIS | SLOW_DIGEST | FREE_ACT | SPEED | DEX | CON | FLY | LUCK
-F:XTRA_MIGHT | XTRA_SHOTS | IM_ELEC | REFLECT | INVIS | STEALTH |
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:RES_CHAOS | RES_DISEN | RES_CONF | RES_BLIND | INFRA | ESP_ORC | ESP_TROLL | ESP_EVIL |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:Designed to be used with the Seeker Bolt of Feanor, this Crossbow 
 D:is perfect against the terrible powers of Morgoth.
 
@@ -2168,8 +3547,16 @@ N:153:of the Sandworm
 I:36:4:5
 W:30:3:80:65000
 P:30:0d0:0:0:0
-F:RES_POIS | RES_ELEC | RES_FIRE | RES_ACID | SPECIAL_GENE
-F:TUNNEL | STR | STEALTH | INFRA | ESP_ANIMAL
+F:ESP_ANIMAL
+F:INFRA
+F:RES_ACID
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SPECIAL_GENE
+F:STEALTH
+F:STR
+F:TUNNEL
 D:This powerful piece of armour was made using the remains of 
 D:the Sandworm Queen.
 
@@ -2180,8 +3567,14 @@ N:154:'Dragonbane'
 I:22:28:2
 W:70:20:260:33000
 P:0:3d8:20:20:0
-F:BLOWS | KILL_DRAGON | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_POIS | SHOW_MODS
+F:BLOWS
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
 D:Forged by the Dwarves to defend their home of Khazad-dum from dragons, 
 D:this axe has been lost to time... until now.
 
@@ -2192,7 +3585,11 @@ N:155:'Limbslicer'
 I:24:8:4
 W:15:3:140:12000
 P:0:2d5:12:15:0
-F:DEX | VORPAL | HIDE_TYPE | SHOW_MODS | WOUNDING
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The Petty-dwarves of Bathak forged this blade, and it shares their thirst 
 D:for blood.
 
@@ -2203,8 +3600,12 @@ N:156:'Orchast'
 I:24:11:4
 W:15:2:170:12000
 P:0:2d7:20:14:0
-F:DEX | SEARCH | SLAY_ORC | ACTIVATE | HIDE_TYPE | SHOW_MODS
+F:ACTIVATE
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
 f:COULD2H
 a:ORCHAST
 D:Forged by the dwarves of Khazad-dum in a time of desperation, 
@@ -2217,8 +3618,16 @@ N:157:of the Night
 I:24:1:4
 W:45:20:45:34000
 P:0:2d6:34:22:0
-F:DEX | STEALTH | VAMPIRIC | KILL_UNDEAD | RES_DARK | HIDE_TYPE | 
-F:SHOW_MODS | SEE_INVIS | ACTIVATE | DRAIN_EXP
+F:ACTIVATE
+F:DEX
+F:DRAIN_EXP
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
+F:VAMPIRIC
 a:NIGHT
 D:Found on an unmarked grave after a violent storm, this hatchet 
 D:has a sinister aura of darkness and decay.
@@ -2230,8 +3639,16 @@ N:158:'Naturebane'
 I:24:30:3
 W:70:20:300:28400
 P:0:5d7:31:27:0
-F:STR | SLAY_ANIMAL | SUST_STR | RES_SHARDS | RES_NEXUS | FEATHER | 
-F:HIDE_TYPE | SHOW_MODS | ACTIVATE | DRAIN_HP
+F:ACTIVATE
+F:DRAIN_HP
+F:FEATHER
+F:HIDE_TYPE
+F:RES_NEXUS
+F:RES_SHARDS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:STR
+F:SUST_STR
 a:NATUREBANE
 D:Used by the orcs in their battle at Dagor Bragollach against the elves, this 
 D:axe has a bloodthirst for nature.
@@ -2243,8 +3660,14 @@ N:159:of Ice
 I:24:8:3
 W:30:25:140:26550
 P:0:2d5:3:15:0
-F:INT | CHR | SUST_DEX | BRAND_COLD | IM_COLD | RES_NEXUS | HIDE_TYPE | 
+F:BRAND_COLD
+F:CHR
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:RES_NEXUS
 F:SHOW_MODS
+F:SUST_DEX
 D:Crafted of purest ice and held solid by powerful spells, this icy axe 
 D:delivers a chill of death to its victims.
 
@@ -2255,62 +3678,30 @@ N:160:of Knowledge
 I:32:5:-6
 W:20:5:75:100000
 P:6:1d3:0:0:20
-F:LITE1 | HIDE_TYPE | SPECIAL_GENE | LUCK
-F:AUTO_ID | ACTIVATE
+F:ACTIVATE
+F:AUTO_ID
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:SPECIAL_GENE
 a:KNOWLEDGE
 D:This helm, designed by Petty-Dwarves ages ago to act as the brain of a 
 D:long lost project, is made of finest glass.  Its light banishes all secrets, 
 D:and makes audible whispers from the deceased.
 
-
-### Trapping Kits ###
-
-### note prices and rarities may have to be adjusted ###
-
-# The Catapult Trap Set of Ahromarwar 
-
-N:161:of Ahromarwar
-I:46:1:3
-W:20:10:40:20000
-P:0:0d0:25:15:30
-F:STEALTH | AUTOMATIC_99 | XTRA_MIGHT | HIDE_TYPE
-D:A trap that can almost never be detected.  Its missiles may be mere pebbles, 
-D:but fired at an incredibly high velocity to penetrate even the toughest 
-D:hide or armour.
-
-
-# The Device Trap Set 'Hanisbroner's Surprise'
-
-N:162:'Hanisbroner's Surprise'
-I:46:6:3
-W:20:20:40:20000
-P:0:0d0:0:0:25
-F:STEALTH | XTRA_SHOTS | TELEPORT_TO | HIDE_TYPE | AUTOMATIC_99
-D:A magical trap, armed with a wand.  Unaccountably, its victims keep 
-D:on coming back for more...
-
-
-# The Bolt Trap Set 'Merlion Karc's Demonbane'
-
-N:163:'Merlion Karc's Demonbane'
-I:46:3:2
-W:20:20:200:20000
-P:0:0d0:17:27:37
-F:STEALTH | XTRA_SHOTS | XTRA_MIGHT | HIDE_TYPE | ONLY_DEMON
-D:A snare set not for animals, or people, but for demons alone, and 
-D:enchanted so that whenever the demon sets foot or claw into the 
-D:(hidden) pentagram, its hide is immediately pierced by many magical 
-D:crossbow bolts.
-
-
 # The Broken Sword 'Narsil'
 
 N:164:'Narsil'
 I:23:2:2
 W:20:5:30:2000
 P:0:3d2:6:10:0
-F:STR | DEX | HIDE_TYPE | BLESSED | 
-F:SLAY_ORC | SLAY_TROLL | RES_FIRE
+F:BLESSED
+F:DEX
+F:HIDE_TYPE
+F:RES_FIRE
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:The sword that was broken shall be reforged...
 
 
@@ -2322,7 +3713,8 @@ N:165:'Lebohaum'
 I:32:6:0
 W:20:15:15:25000
 P:20:0d0:0:0:80
-F:ACTIVATE | EASY_USE
+F:ACTIVATE
+F:EASY_USE
 a:LEBOHAUM
 D:With the Helm 'Lebohaum' your head is safe!
 
@@ -2333,11 +3725,22 @@ N:166:'Mediator'
 I:38:30:0
 W:95:12:500:400000
 P:50:2d4:-8:0:35
-F:FEATHER | FLY | ESP_DRAGON |
-F:RES_NEXUS | RES_CHAOS | AGGRAVATE | REGEN | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
 F:ACTIVATE
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:RES_NEXUS
+F:RES_SHARDS
+F:RES_SOUND
 a:MEDIATOR
 D:A mighty suit of dragon armour, set with the scales of dragons of both 
 D:Law and Chaos, and with power over both.
@@ -2349,7 +3752,10 @@ N:167:of Himring
 I:36:6:0
 W:50:20:100:35000
 P:6:0d0:0:0:15
-F:RES_CHAOS | RES_NETHER | RES_POIS | ACTIVATE
+F:ACTIVATE
+F:RES_CHAOS
+F:RES_NETHER
+F:RES_POIS
 a:PROT_EVIL
 D:Contained within this studded cuirass of pliable leather is the memory of 
 D:unvanquished Himring, defiant fortress surrounded by the legions of Morgoth.
@@ -2361,8 +3767,13 @@ N:168:'Hithlomir'
 I:36:4:4
 W:20:3:80:45000
 P:4:0d0:0:0:20
-F:STEALTH | HIDE_TYPE | SEARCH | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
 D:Familiar with the secret ways hidden in darkness, this leather cuirass is 
 D:truly more than it appears.
 
@@ -2374,10 +3785,19 @@ N:169:of Gil-galad
 I:34:10:5
 W:70:4:80:65000
 P:10:1d3:0:0:20
-F:ACTIVATE | 
-F:LITE1 | WIS | CHR | SEARCH | LUCK
-F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE | 
-F:SUST_WIS | SUST_DEX | SUST_CHR
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:SUST_CHR
+F:SUST_DEX
+F:SUST_WIS
+F:WIS
 a:GILGALAD
 D:The legendary shield of Gil-Galad, who fought his way to the gates of 
 D:the Dark Tower, and with whom came light even to Gorgoroth.
@@ -2389,9 +3809,15 @@ N:170:of Celebrimbor
 I:32:3:3
 W:55:12:20:45000
 P:3:1d1:0:0:18
-F:INT | DEX | CHR | SPELL | SEARCH | 
-F:RES_FIRE | RES_ACID | RES_DISEN | RES_SHARDS | 
 F:ACTIVATE
+F:CHR
+F:DEX
+F:INT
+F:RES_ACID
+F:RES_DISEN
+F:RES_FIRE
+F:RES_SHARDS
+F:SPELL
 a:CELEBRIMBOR
 D:This once belonged to Celebrimbor, maker of the Rings of Power.  One who 
 D:knows both fire and acid, from the business of forging and engraving, will 
@@ -2406,9 +3832,17 @@ N:171:of Umbar
 I:19:24:2
 W:60:20:200:35000
 P:0:4d1:18:18:0
-F:STR | CON | XTRA_MIGHT | AGGRAVATE | 
-F:RES_LITE | RES_DARK | RES_BLIND | RES_ELEC | 
-F:HIDE_TYPE | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:STR
+F:XTRA_MIGHT
 a:UMBAR
 D:A great brazen arbalest with arms of gleaming steel, shooting quarrels with 
 D:speed and power for those brave enough to risk betrayal.
@@ -2421,8 +3855,13 @@ N:172:of Amrod
 I:19:12:2
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:STR | CON | XTRA_MIGHT | 
-F:RES_FIRE | RES_ELEC | RES_COLD | REGEN
+F:CON
+F:REGEN
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+F:XTRA_MIGHT
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2436,8 +3875,16 @@ N:173:of Amras
 I:19:12:1
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:INT | WIS | DEX | XTRA_SHOTS | XTRA_MIGHT | SPEED | 
-F:RES_FIRE | RES_ELEC | RES_COLD | SLOW_DIGEST
+F:DEX
+F:INT
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SLOW_DIGEST
+F:SPEED
+F:WIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2451,10 +3898,20 @@ N:174:of Nain
 I:20:7:6
 W:60:5:250:30000
 P:0:3d8:12:18:0
-F:TUNNEL | INFRA | SEARCH | STR | ESP_ORC | CLIMB | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | RES_ACID | RES_DARK | RES_DISEN | 
 F:ACTIVATE
+F:BRAND_ACID
+F:CLIMB
+F:ESP_ORC
+F:INFRA
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 a:STONE_MUD
 D:Wielded by Nain of the Iron Hills at the Battle of Azanulbizar, this great 
 D:mattock brought victory to the Dwarves over Azog's Orcs - though Nain 
@@ -2467,11 +3924,20 @@ N:175:of Fundin Bluecloak
 I:21:6:4
 W:25:100:130:60000
 P:0:5d4:13:17:10
-F:STR | WIS | SPEED | LITE1 | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_UNDEAD | 
-F:RES_FIRE | RES_ELEC | RES_NETHER | RES_DISEN | HOLD_LIFE | 
 F:ACTIVATE
 F:COULD2H
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 f:COULD2H
 a:FUNDIN
 D:The weapon of one of the great dwarven priests, with powers 
@@ -2485,9 +3951,16 @@ N:176:of the Haradrim
 I:34:4:2
 W:35:12:120:25000
 P:4:1d2:0:0:15
-F:ACTIVATE | 
-F:STR | CON | SUST_STR | SUST_CON | HIDE_TYPE | 
-F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_FEAR
+F:RES_POIS
+F:STR
+F:SUST_CON
+F:SUST_STR
 a:HARADRIM
 D:A great shield from the far lands of the South, whose wielder 
 D:will go charging into battle heedless of danger, with the 
@@ -2501,12 +3974,22 @@ N:177:'Skullcleaver'
 I:21:15:5
 W:30:15:500:60000
 P:0:5d4:11:23:20
-F:STR | TUNNEL | INFRA | HIDE_TYPE | 
-F:CURSED | AGGRAVATE | NO_MAGIC | 
-F:RES_NEXUS | RES_BLIND | RES_SOUND | 
-F:KILL_DRAGON | SLAY_ANIMAL | BRAND_POIS | BRAND_ELEC | 
 F:ACTIVATE
+F:AGGRAVATE
+F:BRAND_ELEC
+F:BRAND_POIS
 F:COULD2H
+F:CURSED
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
+F:NO_MAGIC
+F:RES_BLIND
+F:RES_NEXUS
+F:RES_SOUND
+F:SLAY_ANIMAL
+F:STR
+F:TUNNEL
 f:COULD2H
 a:SKULLCLEAVER
 D:This mighty bludgeon brings destruction to all around it, and is the 
@@ -2519,8 +4002,17 @@ N:178:of Eol
 I:31:2:3
 W:55:35:25:40000
 P:3:1d1:0:0:15
-F:INT | MANA | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | ACTIVATE
-F:LUCK | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:FEATHER
+F:FREE_ACT
+F:INT
+F:LUCK
+F:MANA
+F:RES_DARK
+F:RES_ELEC
+F:RES_POIS
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:EOL
 D:The iron-shod gauntlets of the Dark Elven smith Eol, tingling with magics 
 D:that he could channel in battle.
@@ -2532,7 +4024,10 @@ N:179:of Nevrast
 I:30:3:3
 W:20:8:40:35000
 P:3:1d1:0:0:13
-F:STEALTH | CON | SPEED | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
+F:SPEED
+F:STEALTH
 D:Footgear made of bear leather and set with opals, which grant the wearer 
 D:silent, hasted movement.
 
@@ -2543,7 +4038,10 @@ N:180:of Gimli
 I:30:6:4
 W:40:8:60:22500
 P:4:1d1:5:5:10
-F:INFRA | SEARCH | TUNNEL | CLIMB | HIDE_TYPE
+F:CLIMB
+F:HIDE_TYPE
+F:INFRA
+F:TUNNEL
 Z:magic map
 D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless 
 D:ally to those journeying through halls of stone under mountains.
@@ -2556,9 +4054,19 @@ N:181:of Gothmog
 I:115:55:-20
 W:10:0:150:500
 P:0:7d6:13:13:0
-F:SHOW_MODS | SLAY_DEMON | SLAY_EVIL | BRAND_FIRE | BRAND_POIS
-F:LUCK | CHAOTIC | LITE1 | WOUNDING | RES_MORGUL | WIELD_CAST
-F:HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:HEAVY_CURSE
+F:LITE1
+F:LUCK
+F:RES_MORGUL
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:WIELD_CAST
+F:WOUNDING
 
 
 # The Demonshield of Gothmog
@@ -2567,9 +4075,18 @@ N:182:of Gothmog
 I:115:56:4
 W:15:0:70:500
 P:13:1d1:0:0:13
-F:DEX | INVIS | SUST_STR | SUST_CON | SUST_DEX
-F:FEATHER | SH_FIRE | FREE_ACT | HOLD_LIFE
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:INVIS
+F:SH_FIRE
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIELD_CAST
 
 
 # The Demonhorn of Gothmog
@@ -2578,9 +4095,15 @@ N:183:of Gothmog
 I:115:57:-5
 W:20:0:30:500
 P:2:1d1:0:0:13
-F:LITE2 | REGEN | ESP_DEMON
-F:CHR | SLOW_DIGEST | SEE_INVIS
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:CHR
+F:ESP_DEMON
+F:HEAVY_CURSE
+F:LITE2
+F:REGEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:WIELD_CAST
 
 
 # The Long Sword 'Durandil'
@@ -2590,8 +4113,11 @@ N:184:'Durandil'
 I:23:17:3
 W:5:10:130:500
 P:0:2d5:5:6:0
-F:RES_FEAR | LUCK
-F:ACTIVATE | EASY_USE | SHOW_MODS
+F:ACTIVATE
+F:EASY_USE
+F:LUCK
+F:RES_FEAR
+F:SHOW_MODS
 a:DURANDIL
 D:Don't go adventuring without your Durandil sword!
 
@@ -2602,9 +4128,21 @@ N:200:of Undeath
 I:39:103:-5
 W:20:10:10:0
 P:0:1d1:0:0:0
-F:CURSED | INT | WIS | CON | DEX | CHR | STR | ACTIVATE |
-F:LITE3 | LITE2 | LUCK | MAGIC_BREATH
-F:INSTA_ART | DG_CURSE | ESP_UNDEAD |
+F:ACTIVATE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:DG_CURSE
+F:ESP_UNDEAD
+F:INSTA_ART
+F:INT
+F:LITE2
+F:LITE3
+F:LUCK
+F:MAGIC_BREATH
+F:STR
+F:WIS
 a:UNDEATH
 D:It appears like the Phial of Galadriel at first - but wait! It 
 D:is a cursed phial created by an evil wizard to lure adventurers 
@@ -2617,7 +4155,8 @@ N:201:
 I:9:1:0
 W:200:1:10:0
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 # The Palantir of Orthanc
@@ -2626,9 +4165,18 @@ N:202:of Orthanc
 I:39:104:2
 W:75:60:200:100000
 P:0:10d10:0:0:0
-F:WIS | INT | SEARCH | INFRA | HIDE_TYPE | ACTIVATE | ESP_ALL | 
-F:SEE_INVIS | RES_BLIND | AGGRAVATE | DRAIN_MANA | LITE2
+F:ACTIVATE
+F:AGGRAVATE
+F:DRAIN_MANA
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:INT
+F:LITE2
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
 a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
@@ -2644,10 +4192,19 @@ N:203:of Phasing
 I:45:55:15
 W:110:0:2:3000000
 P:0:1d1:0:0:0
-F:SPEED | SEE_INVIS | LUCK | MAGIC_BREATH
-F:CURSED | HEAVY_CURSE | REGEN
-F:WRAITH | IM_NETHER | DRAIN_EXP | HOLD_LIFE | SPECIAL_GENE |
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:IM_NETHER
 F:INSTA_ART
+F:LUCK
+F:MAGIC_BREATH
+F:REGEN
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:WRAITH
 Z:teleport
 D:Imbued with the screams of the victims of undead everywhere, this 
 D:ring is more a hole in reality than anything else.  Strange forces ripple over 
@@ -2662,12 +4219,26 @@ N:204:'Toris Mejistos'
 I:40:18:2
 W:50:10:3:60000
 Z:restore life
-F:INT | WIS | HIDE_TYPE | MANA | LUCK
-F:SUST_INT | SUST_WIS | LITE1 | REGEN
-F:SLOW_DIGEST | AUTO_CURSE | HEAVY_CURSE
-F:ESP_GOOD | ESP_EVIL | HOLD_LIFE
-F:INSTA_ART | SPECIAL_GENE | WATER_BREATH
-F:SPELL_CONTAIN | WIELD_CAST
+F:AUTO_CURSE
+F:ESP_EVIL
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:INT
+F:LITE1
+F:LUCK
+F:MANA
+F:REGEN
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WATER_BREATH
+F:WIELD_CAST
+F:WIS
 D:A blue stone, with an incredible number of incredibly small runes of power 
 D:on it.  It carries many secrets.
 
@@ -2677,10 +4248,26 @@ D:on it.  It carries many secrets.
 N:205:of Durin
 I:45:57:2
 W:70:70:2:65000
-F:CON | CHR | STR | SUST_CHR | SUST_CON | SUST_STR | HIDE_TYPE | 
-F:ESP_EVIL | AGGRAVATE | HEAVY_CURSE | HOLD_LIFE | DRAIN_EXP | 
-F:RES_DARK | RES_CHAOS | RES_NETHER | RES_COLD | RES_ACID | 
-F:INSTA_ART | SPECIAL_GENE | CURSED
+F:AGGRAVATE
+F:CHR
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SPECIAL_GENE
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
 Z:Midas touch
 D:The greatest of the Seven Rings of the Dwarf-lords, and the last to be 
 D:lost.  Alone among the Seven, it was not taken by Sauron when he made 
@@ -2695,9 +4282,18 @@ N:206:'Elessar'
 I:40:19:4
 W:60:60:3:40000
 P:0:0d0:7:7:10
-F:STR | WIS | CHR | SPEED | LITE3 | INSTA_ART | 
-F:RES_FEAR | RES_FIRE | RES_POIS | RES_DISEN | HIDE_TYPE | 
 F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SPEED
+F:STR
+F:WIS
 a:ELESSAR
 D:This green gem glows with inner light.  Aragorn son of Arathorn wore 
 D:it at the Battle of the Pelennor Fields, and he was himself given the 
@@ -2709,9 +4305,18 @@ D:name of 'Elessar' by the people of Gondor because of this.
 N:207:'Evenstar'
 I:40:20:3
 W:50:50:3:35000
-F:HOLD_LIFE | SUST_CON | SUST_WIS | SUST_INT | LITE1 | CON | 
-F:RES_DARK | RES_COLD | RES_NETHER | REGEN | INSTA_ART | 
 F:ACTIVATE
+F:CON
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SUST_CON
+F:SUST_INT
+F:SUST_WIS
 a:REST_ALL
 D:A pure white jewel, the last gift of Queen Arwen Undomiel to Frodo 
 D:Baggins, intended to be worn around his neck on the chain that had 
@@ -2724,9 +4329,20 @@ N:208:of Minas Ithil
 I:39:107:-3
 W:75:60:200:0
 P:0:10d10:0:0:-30
-F:LIFE | CON | INT | WIS | ESP_ALL | LITE3 | LITE1
-F:CURSED | HEAVY_CURSE | TY_CURSE | DRAIN_EXP | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
+F:ACTIVATE
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_ALL
+F:HEAVY_CURSE
+F:INT
+F:LIFE
+F:LITE1
+F:LITE3
+F:RES_BLIND
+F:SEE_INVIS
+F:TY_CURSE
+F:WIS
 a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
@@ -2742,8 +4358,12 @@ N:209:'Balefire'
 I:18:3:0
 W:55:30:2:50000
 P:0:6d5:20:15:0
-F:ESP_DEMON | ESP_UNDEAD | LITE1 |
-F:BRAND_FIRE | KILL_DEMON | KILL_UNDEAD |
+F:BRAND_FIRE
+F:ESP_DEMON
+F:ESP_UNDEAD
+F:KILL_DEMON
+F:KILL_UNDEAD
+F:LITE1
 D:This silver-tipped bolt, ablaze with undying celestial fire, 
 D:is especially potent against undead and creatures of the 
 D:netherworld; it even points the way to places where such 
@@ -2756,9 +4376,14 @@ N:210:'Stone-biter'
 I:18:3:3
 W:55:30:2:50000
 P:0:6d5:20:15:0
-F:ESP_ORC | ESP_TROLL |
-F:INFRA | SEARCH | TUNNEL | LUCK
-F:BRAND_ACID | SLAY_ORC | SLAY_TROLL |
+F:BRAND_ACID
+F:ESP_ORC
+F:ESP_TROLL
+F:INFRA
+F:LUCK
+F:SLAY_ORC
+F:SLAY_TROLL
+F:TUNNEL
 D:Wherever it strikes, this silver-tipped bolt eats through rock 
 D:and metal as easily as through flesh.  The dwarf-smith who 
 D:crafted Stone-biter also inscribed the shaft with powerful 
@@ -2772,7 +4397,9 @@ N:211:'Heart's Blood'
 I:18:2:5
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:VORPAL | WOUNDING | CRIT |
+F:CRIT
+F:VORPAL
+F:WOUNDING
 D:The barbed head of this bolt glows deep red with terrible runes 
 D:of destruction; legend has it that Heart's Blood cannot hit its 
 D:mark without causing a mortal wound.
@@ -2784,8 +4411,9 @@ N:212:'Scale-piercer'
 I:18:2:0
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:ESP_DRAGON | RES_FEAR |
-F:KILL_DRAGON |
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
 D:This bolt, crafted from the bones of a Great Wyrm, is less famous 
 D:and less powerful than Bard's black arrow.  Nonetheless it enables 
 D:the owner to find dragons unerringly, face them bravely, and kill 
@@ -2802,10 +4430,20 @@ N:213:of Forochel
 I:6:1:3
 W:65:70:60:60000
 P:0:3d4:-12:-8:0
-F:INT | WIS | MANA | SPELL | INFRA | SEE_INVIS
-F:SUST_INT | SUST_WIS | RES_BLIND | IM_COLD | SENS_FIRE
-F:SPECIAL_GENE | WIELD_CAST
 F:COULD2H
+F:IM_COLD
+F:INFRA
+F:INT
+F:MANA
+F:RES_BLIND
+F:SEE_INVIS
+F:SENS_FIRE
+F:SPECIAL_GENE
+F:SPELL
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 D:A shaft of pure, invincible crystal cut from the heart of one 
 D:of the great glaciers ringing the Ice-Bay of Forochel. 
@@ -2818,8 +4456,16 @@ N:214:of Mellyrn
 I:35:2:4
 W:40:40:5:65000
 P:4:0d0:0:0:20
-F:HIDE_TYPE | INVIS | DEX |  SPEED | STEALTH | LUCK
-F:SUST_DEX | RES_LITE | RES_DARK | SPECIAL_GENE
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:RES_DARK
+F:RES_LITE
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:Bearing the same lyrical name as the great trees of Lothlorien 
 D:and containing in its close-woven folds the speed and skill of 
 D:the Galadrim, this grey cloak is ideal for those who travel in 
@@ -2832,9 +4478,18 @@ N:215:of Ephel Duath
 I:23:31:-3
 W:60:60:50:30000
 P:0:2d6:-20:-18:0
-F:STR | WIS | CHR | BRAND_POIS | VAMPIRIC | VORPAL
-F:INVIS | AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_POIS
+F:CHR
+F:CURSED
+F:HEAVY_CURSE
+F:INVIS
+F:SHOW_MODS
 F:SPECIAL_GENE
+F:STR
+F:VAMPIRIC
+F:VORPAL
+F:WIS
 D:This filthy orc-blade is famed for vile deeds of torture and blood, 
 D:and its wielder will never cease to fear treachery.
 
@@ -2845,10 +4500,22 @@ N:216:'Garachoth'
 I:24:30:2
 W:70:300:400:91000
 P:0:7d5:18:18:-20
-F:STR | CON | SPEED | LEVELS | BLACK_BREATH
-F:KILL_DEMON | SLAY_ANIMAL |  BRAND_FIRE | VORPAL
-F:RES_FEAR | RES_FIRE | RES_CHAOS | RES_NETHER 
-F:HIDE_TYPE | SHOW_MODS | SPECIAL_GENE
+F:BLACK_BREATH
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LEVELS
+F:RES_CHAOS
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NETHER
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:VORPAL
 D:A ghastly axe with the soul of a demon lord trapped inside, this horrifying 
 D:creation reverberates with the screams of the damned.  As you gaze into its 
 D:glassy, translucent blade, it seems that endless sulphrous wastelands 
@@ -2861,9 +4528,20 @@ N:217:'Skycleaver'
 I:31:5:1
 W:40:45:40:100000
 P:5:1d1:16:7:16
-F:STR | CON | DEX | CHR | LUCK | FLY
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS
-F:HIDE_TYPE | SHOW_MODS | SPECIAL_GENE
+F:CHR
+F:CON
+F:DEX
+F:FLY
+F:HIDE_TYPE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:STR
 D:The handgear of a legendary dragonslaying hero.  The wearer of these 
 D:wyrmskin gauntlets will be versed in all aerial ways, and will fear no 
 D:dragon that walks or flies.
@@ -2876,9 +4554,16 @@ N:218:of the Machine
 I:30:6:3
 W:30:100:170:19000
 P:6:1d1:0:0:24
-F:INT | SPEED | TUNNEL | AGGRAVATE 
-F:RES_CHAOS | RES_SHARDS | RES_CONF
-F:ESP_NONLIVING | HIDE_TYPE | SPECIAL_GENE
+F:AGGRAVATE
+F:ESP_NONLIVING
+F:HIDE_TYPE
+F:INT
+F:RES_CHAOS
+F:RES_CONF
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
+F:TUNNEL
 D:A massive pair of adamantine boots studded with gold, the final and 
 D:greatest product of the petty-dwarven magical forge.  Despite 
 D:the great powers they contain, they are heavy and awkward enough to 
diff --git a/lib/edit/ab_info.txt b/lib/edit/ab_info.txt
index 976c6d03..579368f4 100644
--- a/lib/edit/ab_info.txt
+++ b/lib/edit/ab_info.txt
@@ -20,8 +20,6 @@
 # S:level(linear mode):stats
 # a:needed ability
 
-# E:excluding ability:excluding ability
-
 # Do not forget to update misc.txt with an entry like the following :
 # Maximum number of traits in ab_info.txt
 # M:b:50
@@ -86,13 +84,6 @@ A:102:Far reaching attack
 k:15:Combat
 k:15:Polearm-mastery
 
-N:9:Trapping
-D:Ability to set monster traps
-D:Prereq: Disarming@15
-I:10
-A:14:Set trap
-k:15:Disarming
-
 N:10:Undead Form
 D:Ability to turn into a weak undead being when you "die".
 D:You must then kill enough monsters to absorb enough life energy
diff --git a/lib/edit/ba_info.txt b/lib/edit/ba_info.txt
index e5c49759..20e7bb77 100644
--- a/lib/edit/ba_info.txt
+++ b/lib/edit/ba_info.txt
@@ -85,10 +85,6 @@ N:17:Look at busts of Kings
 C:0:0:0
 I:5:0:l
 
-N:18:Research monster
-C:1600:1500:1400
-I:20:0:r
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
diff --git a/lib/edit/between.map b/lib/edit/between.map
index 1458cdb7..d522799f 100644
--- a/lib/edit/between.map
+++ b/lib/edit/between.map
@@ -23,16 +23,16 @@ F:G:89:5:955
 F:L:89:5:956
 
 # Floor with grass with a brown thunderlord
-F:B:89:5:957:0:0:0:0:0:0:2
+F:B:89:5:957:0:0:0:0:0:2
 
 # Floor with grass with a bronze thunderlord
-F:z:89:5:958:0:0:0:0:0:0:2
+F:z:89:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a bronze thunderlord
-F:Z:88:5:958:0:0:0:0:0:0:2
+F:Z:88:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a gold thunderlord
-F:D:88:5:959:0:0:0:0:0:0:2
+F:D:88:5:959:0:0:0:0:0:2
 
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:X..T.TT..T...T...T...T.....T....T......T...T.,,.....T......T....T...T.T..T..TT...T..T.TT.T.TT.TX
diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index 24526ea2..fe20c276 100644
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -12,7 +12,7 @@
 
 # N:<index>:<name>
 # D:<3 letter short name>:<long name>
-# W:<min depth>:<max depth>:<min player level>:<next dungeon>:<min alloc>:<max alloc chance>
+# W:<min depth>:<max depth>:<min player level>:<min alloc>:<max alloc chance>
 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>
 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>
 # O:<%treasure>:<%combat>:<%magic>:<%tools>
@@ -33,58 +33,71 @@
 
 N:0:Wilderness
 D:Wil:a way to the Wilderness
-W:0:0:0:0:14:500
+W:0:0:0:14:500
 L:89:80:199:20:1:0
 A:96:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | FLAT | NO_RECALL
+F:FLAT
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 ### The principal dungeons, they were created by spliting the vanilla dungeon ###
 
 N:1:Mirkwood
 D:Mkw:a way to the Mirkwood Forest.
-W:11:33:5:0:14:160
+W:11:33:5:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:PRINCIPAL | NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:PRINCIPAL
 R:100:0
 
 N:2:Mordor
 D:Mdr:a door to the Land of Mordor.
-W:34:66:15:0:14:160
+W:34:66:15:14:160
 L:88:67:93:33:1:0
 L:0:100:0
 A:97:50:56:50:56:0:57:97
 A:0:100:0
 O:20:20:20:20
-F:PRINCIPAL | LAVA_RIVER | CAVERN | NO_STREAMERS
+F:CAVERN
 F:FILL_METHOD_2
+F:LAVA_RIVER
+F:NO_STREAMERS
+F:PRINCIPAL
 R:100:0
 
 N:3:Angband
 D:Ang:an entrance to the Pits of Angband.
-W:67:127:30:0:14:160
+W:67:127:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | CAVERN | NO_EASY_MOVE | NO_RECALL
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
 F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 N:4:Barrow-Downs
 D:BDw:a way to the Barrow-Downs.
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:96:34:97:66:56:0:57:97
 A:100:0:0
 O:20:20:20:20
-F:PRINCIPAL | FLAT
 F:FILL_METHOD_3
+F:FLAT
+F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
@@ -95,13 +108,18 @@ R:75:0
 # Levels 85-99
 N:5:Mount Doom
 D:MDm:a way to the top of the Mount Doom.
-W:85:99:18:0:14:160
+W:85:99:18:14:160
 L:86:90:205:10:1:0
 A:177:100:0:0:0:0:85:87
 O:10:10:30:30
 E:2d10:10:FIRE
-F:CAVE | LAVA_RIVER | NO_RECALL | NO_STREAMERS | NO_UP
-F:FILL_METHOD_0 | NO_EASY_MOVE
+F:CAVE
+F:FILL_METHOD_0
+F:LAVA_RIVER
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_STREAMERS
+F:NO_UP
 R:100:1
 M:IM_FIRE
 
@@ -110,47 +128,67 @@ M:IM_FIRE
 # guarded by Tik'srvzllat, who has the Ring of Phasing
 N:6:Nether Realm
 D:Nth:a magical portal to the Nether Realm.
-W:666:696:40:0:14:160
+W:666:696:40:14:160
 L:102:80:86:15:85:5
 A:85:80:87:20:87:0:57:85
 A:50:50:0
 O:25:25:25:25
 E:10d10:3:NETHER
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_SHAFT
-F:RANDOM_TOWNS | ADJUST_LEVEL_2 | NO_RECALL | NO_STREAMERS
-F:LAVA_RIVER | FINAL_GUARDIAN_1032 | FINAL_ARTIFACT_203
-F:FILL_METHOD_2 | NO_RECALL_OUT | NO_UP
+F:ADJUST_LEVEL_2
+F:EMPTY
+F:FILL_METHOD_2
+F:FINAL_ARTIFACT_203
+F:FINAL_GUARDIAN_1032
+F:FORGET
+F:LAVA_RIVER
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
+F:NO_UP
+F:RANDOM_TOWNS
 R:5:0
 R:95:3
-M:RES_NETH | R_CHAR_G | R_CHAR_W | R_CHAR_U
+M:RES_NETH
+M:R_CHAR_G
+M:R_CHAR_U
+M:R_CHAR_W
 
 # The Lost Land of Numenor
 # levels 35-50
 # guarded by Ar-Pharazon the Golden, who has the stone "Toris Mejistos".
 N:7:Submerged Ruins
 D:Num:a submerged way to the lost land of Numenor.
-W:35:50:25:0:14:160
+W:35:50:25:14:160
 L:84:95:187:5:1:0
 A:187:80:84:10:56:10:57:187
 A:60:0:40
 O:30:30:10:10
 E:1d1:1:ACID
+F:FILL_METHOD_3
+F:FINAL_ARTIFACT_204
+F:FINAL_GUARDIAN_980
 F:NO_STREAMERS
-F:FINAL_GUARDIAN_980 | FINAL_ARTIFACT_204
-F:FILL_METHOD_3 | WATER_BREATH
+F:WATER_BREATH
 R:20:0
 R:80:3
-M:AQUATIC | CAN_SWIM | CAN_FLY
+M:AQUATIC
+M:CAN_FLY
+M:CAN_SWIM
 
 # Used for astral mode
 N:8:Halls of Mandos
 D:HMa:*A BUG*YOU should see this message!*
-W:1:98:1:0:14:160
+W:1:98:1:14:160
 L:1:100:1:0:1:0
 O:20:20:20:20
 A:56:100:56:0:56:0:57:58
-F:RANDOM_TOWNS | NO_RECALL | NO_SHAFT
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_SHAFT
+F:RANDOM_TOWNS
 R:100:2
 M:UNIQUE
 
@@ -159,35 +197,50 @@ M:UNIQUE
 # guarded by Shelob.
 N:9:Cirith Ungol
 D:CUg:an entrance to Cirith Ungol.
-W:25:50:10:0:14:160
+W:25:50:10:14:160
 L:87:5:88:65:16:30
 A:97:90:16:10:56:0:16:58
 O:30:30:30:10
 E:4d4:20:POISON
-F:FINAL_GUARDIAN_481
 F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_481
 R:2:0
 R:49:3
-M:SPIDER | R_CHAR_c | R_CHAR_a | R_CHAR_I | 
+M:R_CHAR_I
+M:R_CHAR_a
+M:R_CHAR_c
+M:SPIDER
 R:49:3
-M:ORC | R_CHAR_w | R_CHAR_m | R_CHAR_j
+M:ORC
+M:R_CHAR_j
+M:R_CHAR_m
+M:R_CHAR_w
 
 # The Heart of the Earth
 # levels 25-36
 # guarded by Golgarach, the Living Rock
 N:10:Heart of the Earth
 D:HoE:a passage leading into the very heart of the world.
-W:25:36:10:0:14:160
+W:25:36:10:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:40:10:10:20
 G:life
-F:EVOLVE | FINAL_GUARDIAN_1035 | NO_RECALL | NO_SHAFT | NO_UP
+F:EVOLVE
+F:FINAL_GUARDIAN_1035
+F:NO_RECALL
+F:NO_SHAFT
+F:NO_UP
 R:40:3
-M:R_CHAR_# | R_CHAR_X | R_CHAR_g | R_CHAR_E | 
+M:R_CHAR_#
+M:R_CHAR_E
+M:R_CHAR_X
+M:R_CHAR_g
 R:30:3
-M:PASS_WALL | KILL_WALL | HURT_ROCK
+M:HURT_ROCK
+M:KILL_WALL
+M:PASS_WALL
 R:30:0
 
 # The Void
@@ -195,30 +248,43 @@ R:30:0
 # Where Melkor lurks for the final battle!
 N:11:The Void
 D:Vod:a jumpgate to the Void
-W:128:150:40:0:20:160
+W:128:150:40:20:160
 L:183:97:102:3:0:0
 A:183:90:102:10:0:0:102:102
 A:40:60:0
 O:25:25:25:25
 E:20d6:100:DARK
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_RECALL_OUT | NO_RECALL |
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:EMPTY
 F:FILL_METHOD_2
-F:FINAL_GUARDIAN_1044 |
+F:FINAL_GUARDIAN_1044
+F:FORGET
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:1:0
 R:99:3
-M:UNDEAD | DEMON | DRAGON | NONLIVING | SPIRIT
+M:DEMON
+M:DRAGON
+M:NONLIVING
+M:SPIRIT
+M:UNDEAD
 
 # TEST dungeon
 N:12:Test
 D:Tst:a way to test dungeon gen
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:177:100:0:0:0:0:85:87
 A:100:0:0
 O:20:20:20:20
-F:FILL_METHOD_3 | SMALL
+F:FILL_METHOD_3
+F:SMALL
 R:100:0
 G:dungeon2
 
@@ -228,50 +294,70 @@ G:dungeon2
 # Feagwath is there, guarding Doomcaller
 N:16:Paths of the Dead
 D:PoD:the entrance to the Paths of the Dead.
-W:40:70:18:0:24:100
+W:40:70:18:24:100
 L:88:85:84:15:1:0
 A:56:75:87:25:56:0:57:58
 O:30:30:30:2
 E:1d1:20:RAISE
-F:FINAL_GUARDIAN_804 | FINAL_ARTIFACT_91
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_91
+F:FINAL_GUARDIAN_804
 R:5:0
 R:10:3
 M:R_CHAR_p
 R:85:3
-M:UNDEAD | NONLIVING
+M:NONLIVING
+M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
 # Guarded by The Glass Golem guarding The Helm of Knowledge
 N:17:Illusory Castle
 D:Ill:an entrance to the Illusory Castle.
-W:35:52:10:0:24:100
+W:35:52:10:24:100
 L:1:98:188:2:1:0
 A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
-F:RANDOM_TOWNS | NO_STREAMERS
-F:FINAL_GUARDIAN_1033 | FINAL_ARTIFACT_160
 F:FILL_METHOD_1
+F:FINAL_ARTIFACT_160
+F:FINAL_GUARDIAN_1033
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:0
 R:70:3
-M:STUPID | WEIRD_MIND | SHAPECHANGER | ATTR_MULTI | CHAR_MULTI | RAND_25 |
-M:RAND_50 | EMPTY_MIND | INVISIBLE | PASS_WALL | KILL_WALL
-S:BR_CONF | BR_CHAO | BA_CHAO | CONF | FORGET | TRAPS | MULTIPLY
+M:ATTR_MULTI
+M:CHAR_MULTI
+M:EMPTY_MIND
+M:INVISIBLE
+M:KILL_WALL
+M:PASS_WALL
+M:RAND_25
+M:RAND_50
+M:SHAPECHANGER
+M:STUPID
+M:WEIRD_MIND
+S:BA_CHAO
+S:BR_CHAO
+S:BR_CONF
+S:CONF
+S:FORGET
+S:MULTIPLY
 
 # The Maze
 # Levels 25-37
 # Guarded by The Minotaur of the Labyrinth with the Steel Helm of Hammerhand
 N:18:Maze
 D:Maz:a small tunnel leading to a maze of twisty little passages, all alike.
-W:25:37:15:0:20:160
+W:25:37:15:20:160
 L:1:100:1:0:1:0
 A:56:98:48:2:56:0:57:58
 O:2:40:10:40
 G:maze
-F:SMALLEST | FORGET
-F:FINAL_GUARDIAN_1029 | FINAL_ARTIFACT_38
+F:FINAL_ARTIFACT_38
+F:FINAL_GUARDIAN_1029
+F:FORGET
+F:SMALLEST
 R:80:0
 R:20:3
 M:R_CHAR_p
@@ -281,74 +367,97 @@ M:R_CHAR_p
 # There is Azog with the Wand of Thrain at the bottom
 N:19:Orc Cave
 D:Orc:a dark tunnel leading to an Orc Cave.
-W:10:22:8:0:35:200
+W:10:22:8:35:200
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:5:50:10:25
-F:RANDOM_TOWNS | 
-F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE |
+F:CAVE
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_373
+F:FINAL_OBJECT_810
+F:RANDOM_TOWNS
 R:30:3
 M:TROLL
 R:20:0
 R:50:3
-M:ORC | R_CHAR_k | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_k
+M:R_CHAR_o
 
 # Erebor
 # levels 60-72
 # There is Glaurung
 N:20:Erebor
 D:Ere:a tunnel leading into depths of the Lonely Mountain.
-W:60:72:30:0:20:140
+W:60:72:30:20:140
 L:88:100:1:0:1:0
 A:97:90:87:10:56:0:57:97
 O:40:40:40:40
-F:BIG | LAVA_RIVER | CAVERN | NO_RECALL | NO_STREAMERS
-F:CAVE | DOUBLE | FINAL_GUARDIAN_715 | 
+F:BIG
+F:CAVE
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_715
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
 R:10:0
 R:60:1
-M:DRAGON | R_CHAR_D
+M:DRAGON
+M:R_CHAR_D
 R:30:1
-M:DRAGON | R_CHAR_d
+M:DRAGON
+M:R_CHAR_d
 
 # The Old Forest
 # levels 13-25
 # Old Man Willow protects it
 N:21:The Old Forest
 D:OFr:a path into the Old Forest.
-W:13:25:5:0:15:100
+W:13:25:5:15:100
 L:88:76:84:16:199:8
 L:68:16:16
 A:96:100:56:0:56:0:202:96
 O:20:5:15:30
-F:WATER_RIVERS | NO_DOORS | NO_DESTROY | FLAT | NO_STREAMERS
-F:RANDOM_TOWNS | FINAL_GUARDIAN_206
 F:FILL_METHOD_3
+F:FINAL_GUARDIAN_206
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:WATER_RIVERS
 R:30:0
 R:40:3
-M:ANIMAL 
+M:ANIMAL
 R:30:3
-M:UNDEAD | R_CHAR_h
+M:R_CHAR_h
+M:UNDEAD
 
 # The Mines of Moria
 # levels 30-50
 # There is Durin's Bane
 N:22:Moria
 D:MoM:a stone door leading to the Mines of Moria.
-W:30:50:20:0:40:40
+W:30:50:20:40:40
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:30:50:10:5
-F:FINAL_GUARDIAN_872 | WATER_RIVER | BIG | NO_STREAMERS
+F:BIG
+F:FILL_METHOD_0
+F:FINAL_GUARDIAN_872
 F:FORCE_DOWN
+F:NO_STREAMERS
 F:RANDOM_TOWNS
+F:WATER_RIVER
 F:WILD_45_30__44_37
-F:FILL_METHOD_0
 R:40:3
 M:ORC
 R:30:3
-M:TROLL | GIANT
+M:GIANT
+M:TROLL
 R:20:3
 M:DEMON
 R:10:0
@@ -358,20 +467,25 @@ R:10:0
 # The Necromancer (weak Sauron) at the bottom, with the Ring of Durin
 N:23:Dol Guldur
 D:TDG:a gate leading to the tower of Dol Guldur.
-W:57:70:34:0:24:160
+W:57:70:34:24:160
 L:1:80:174:20:1:0
 A:56:100:56:0:56:0:57:58
 O:20:1:70:9
-F:SMALL | FINAL_GUARDIAN_819 | FINAL_ARTIFACT_205
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_205
+F:FINAL_GUARDIAN_819
+F:SMALL
 R:30:3
-M:R_CHAR_p | R_CHAR_P
+M:R_CHAR_P
+M:R_CHAR_p
 R:10:3
-M:ORC | TROLL
+M:ORC
+M:TROLL
 R:20:3
 M:UNDEAD
 R:30:3
-M:DEMON | DRAGON
+M:DEMON
+M:DRAGON
 R:10:0
 
 # Dungeons from Variaz
@@ -381,13 +495,15 @@ R:10:0
 # The Watcher in the Water is at the bottom
 N:24:The Small Water Cave
 D:SWC:the entrance to a small water cave.
-W:32:34:20:0:14:160
+W:32:34:20:14:160
 L:84:100:84:0:84:0
 A:97:100:56:0:56:0:57:58
 O:10:10:30:30
 E:1d1:20:ACID
-F:FINAL_GUARDIAN_517 | NO_RECALL | NO_UP
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_517
+F:NO_RECALL
+F:NO_UP
 R:10:0
 R:10:3
 M:AQUATIC
@@ -403,13 +519,16 @@ M:IM_COLD
 # Levels 45-70
 N:25:The Sacred Land Of Mountains
 D:LoM:the way to the Sacred Land of Mountains.
-W:45:70:20:0:14:160
+W:45:70:20:14:160
 L:89:100:89:0:89:0
 A:97:100:56:0:56:0:97:97
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS
-F:FINAL_GUARDIAN_789 | FINAL_ARTIFACT_27
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_27
+F:FINAL_GUARDIAN_789
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:60:3
 M:CAN_FLY
 R:40:0
@@ -419,14 +538,18 @@ R:40:0
 # Guarded by Ulfang the Black, Morgoth's first Easterling follower.
 N:26:The Land Of Rhun
 D:LoR:a way to the Land of Rhun.
-W:26:40:15:0:14:160
+W:26:40:15:14:160
 L:89:100:1:0:1:0
 A:89:50:96:25:84:25:57:58
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS | FINAL_GUARDIAN_990
 F:FILL_METHOD_1
+F:FINAL_GUARDIAN_990
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:3
-M:R_CHAR_p | R_CHAR_h
+M:R_CHAR_h
+M:R_CHAR_p
 R:30:3
 M:ANIMAL
 R:40:0
@@ -436,13 +559,15 @@ R:40:0
 # guarded by the Sandworm Queen (and her children), who will drop her armour
 N:27:The Sandworm lair
 D:SwL:a sandhole.
-W:22:30:12:0:5:200
+W:22:30:12:5:200
 L:91:85:94:10:93:5
 A:98:100:96:0:84:0:94:94
 O:15:5:60:20
-F:NO_DOORS | SAND_VEIN |
-F:FINAL_GUARDIAN_1030 | FINAL_ARTIFACT_153
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_153
+F:FINAL_GUARDIAN_1030
+F:NO_DOORS
+F:SAND_VEIN
 R:90:3
 M:R_CHAR_w
 R:10:3
@@ -451,12 +576,15 @@ S:MULTIPLY
 # Used by the death fate
 N:28:Death fate
 D:Dth:a fated death.
-W:1:1:1:0:30:255
+W:1:1:1:30:255
 L:1:100:1:0:1:0
 A:1:100:1:0:1:0:1:1
 O:1:1:1:1
-F:EMPTY | SMALLEST | NO_RECALL | NO_STREAMERS
+F:EMPTY
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_STREAMERS
+F:SMALLEST
 R:100:0
 
 # The Grinding Ice
@@ -464,16 +592,19 @@ R:100:0
 # Guarded by the White Balrog
 N:29:The Helcaraxe
 D:Ice:the entrance to the Grinding Ice of the Helcaraxe.
-W:20:40:10:0:14:160
+W:20:40:10:14:160
 L:90:0:88:70:84:30
 L:90:0:10
 A:95:0:56:100:56:0:57:58
 A:100:0:0
 O:20:20:20:20
 E:1d4:15:COLD
-F:DOUBLE | WATER_RIVER | CAVERN | NO_STREAMERS
-F:FINAL_GUARDIAN_1034 | 
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_1034
+F:NO_STREAMERS
+F:WATER_RIVER
 R:100:1
 M:IM_COLD
 
@@ -483,11 +614,12 @@ M:IM_COLD
 # See god.lua for details
 N:30:a lost temple
 D:LTm:the entrance to a lost temple.
-W:1:50:1:0:14:160
+W:1:50:1:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:FILL_METHOD_4 | NO_RECALL
+F:FILL_METHOD_4
+F:NO_RECALL
 R:100:0
 
 # N:<index>:<name>
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index f3bc1d31..165d4771 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -93,19 +93,11 @@ T:6:0:255
 W:10:1:8:50000
 C:-40:-40:0:3
 R:100
-F:MANA | SPELL
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
-N:4:of Spell
-T:6:0:255
-X:A:24:60
-W:0:2:8:40000
-C:0:0:0:0
-R:100
-F:ACTIVATE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
 ### Body Armor ###
 
 N:5:of Resist Acid
@@ -114,8 +106,10 @@ T:37:0:255
 X:A:30:16
 W:0:4:20:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:6:of Resist Lightning
 T:36:0:255
@@ -123,8 +117,10 @@ T:37:0:255
 X:A:30:10
 W:0:4:20:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:7:of Resist Fire
 T:36:0:15
@@ -133,8 +129,10 @@ T:37:0:255
 X:A:30:14
 W:0:4:20:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:8:of Resist Cold
 T:36:0:15
@@ -143,8 +141,10 @@ T:37:0:255
 X:A:30:12
 W:0:4:20:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:9:of Resistance
 T:36:0:255
@@ -153,9 +153,18 @@ X:A:30:20
 W:0:2:20:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 R:25
 F:R_HIGH
 
@@ -166,11 +175,18 @@ X:B:30:25
 W:0:2:20:15000
 C:0:0:10:3
 R:100
-F:STEALTH | ESP_ORC
-f:STEALTH
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ORC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
+f:STEALTH
 R:25
 F:RES_POIS
 
@@ -181,10 +197,22 @@ X:A:30:30
 W:0:1:10:30000
 C:0:0:10:0
 R:100
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_LIFE | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 R:2
 F:R_IMMUNITY
 
@@ -195,7 +223,10 @@ X:A:30:0
 W:0:1:10:0
 C:0:0:0:-6
 R:100
-F:CON | STR | R_STAT | CURSED
+F:CON
+F:CURSED
+F:R_STAT
+F:STR
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 # Mithirl & Adamantite mails & PDSM
@@ -238,8 +269,10 @@ T:34:7:255
 X:A:32:16
 W:0:6:22:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:17:of Resist Lightning
 T:34:0:5
@@ -248,8 +281,10 @@ T:115:56:56
 X:A:32:10
 W:0:6:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:18:of Resist Fire
 T:34:0:5
@@ -258,8 +293,10 @@ T:115:56:56
 X:A:32:14
 W:0:6:22:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:19:of Resist Cold
 T:115:56:56
@@ -268,8 +305,10 @@ T:34:7:255
 X:A:32:12
 W:0:6:22:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:20:of Resistance
 T:115:56:56
@@ -279,9 +318,18 @@ X:A:32:20
 W:0:2:22:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 
 N:21:of Reflection
 T:115:56:56
@@ -291,9 +339,12 @@ X:A:32:20
 W:0:2:22:15000
 C:0:0:5:0
 R:100
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:REFLECT
 f:REFLECT
-F:IGNORE_ELEC | IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE
 
 # Metal shields only
 N:22:of Electricity
@@ -303,7 +354,9 @@ T:34:10:10
 X:A:32:10
 W:0:2:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC | SH_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 f:SH_ELEC
 
 ### Crowns and Helms ###
@@ -316,7 +369,10 @@ X:A:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:DEX | SUST_DEX | ACTIVATE | ESP_ORC
+F:ACTIVATE
+F:DEX
+F:ESP_ORC
+F:SUST_DEX
 a:NOLDOR
 
 N:24:of Intelligence
@@ -327,7 +383,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | SUST_INT
+F:INT
+F:SUST_INT
 f:INT
 
 N:25:of Wisdom
@@ -338,7 +395,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:WIS | SUST_WIS
+F:SUST_WIS
+F:WIS
 f:WIS
 
 N:26:of Beauty
@@ -349,7 +407,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:CHR | SUST_CHR
+F:CHR
+F:SUST_CHR
 f:CHR
 
 # 40% chance of increase spell power
@@ -359,14 +418,23 @@ W:0:1:8:7500
 C:0:0:0:3
 T:33:0:99
 R:100
-F:INT | SUST_INT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:ABILITY | R_HIGH
+F:ABILITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SUST_INT
 R:40
 F:SPELL
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 N:28:of Might
 X:A:33:19
@@ -374,8 +442,14 @@ W:0:1:8:2000
 C:0:0:0:3
 T:33:0:99
 R:100
-F:STR | DEX | CON | SUST_STR | SUST_DEX | SUST_CON | FREE_ACT
+F:CON
+F:DEX
+F:FREE_ACT
 F:R_HIGH
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 
 N:29:of Lordliness
 X:A:33:17
@@ -383,8 +457,11 @@ W:0:1:8:2000
 C:0:0:0:3
 T:33:0:99
 R:100
-F:WIS | CHR | SUST_WIS | SUST_CHR
+F:CHR
 F:R_HIGH
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 
 N:30:of Seeing
 X:A:33:8
@@ -395,8 +472,8 @@ T:32:8:99
 T:33:0:99
 T:115:57:57
 R:100
-F:SEARCH | RES_BLIND | SEE_INVIS
-f:SEARCH
+F:RES_BLIND
+F:SEE_INVIS
 R:20
 F:ESP_ALL
 
@@ -408,7 +485,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INFRA | HIDE_TYPE
+F:HIDE_TYPE
+F:INFRA
 f:INFRA
 
 N:32:of Light
@@ -418,7 +496,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:LITE1 | RES_LITE
+F:LITE1
+F:RES_LITE
 f:LITE1
 
 N:33:of Telepathy
@@ -460,7 +539,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | CURSED
+F:CURSED
+F:INT
 f:INT
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
@@ -492,7 +572,9 @@ C:0:0:0:-5
 W:0:1:7:0
 T:33:0:99
 R:100
-F:STR | DEX | CON
+F:CON
+F:DEX
+F:STR
 
 N:40:Dwarven
 T:32:0:6
@@ -501,7 +583,11 @@ X:B:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:INFRA | CON | RES_FIRE | ESP_TROLL | ESP_DRAGON
+F:CON
+F:ESP_DRAGON
+F:ESP_TROLL
+F:INFRA
+F:RES_FIRE
 
 
 ### Cloaks ###
@@ -512,7 +598,11 @@ W:0:4:19:1500
 C:0:0:10:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | RES_SHARDS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
 
 N:42:of Stealth
 X:A:31:10
@@ -529,10 +619,13 @@ W:0:1:28:4000
 C:0:0:20:3
 T:35:0:255
 R:100
-F:STEALTH | 
-f:STEALTH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:STEALTH
+f:STEALTH
 
 # Aura, Fire
 N:44:of Immolation
@@ -541,7 +634,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | SH_FIRE | RES_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FIRE
+F:SH_FIRE
 f:SH_FIRE
 
 N:45:of Enveloping
@@ -566,7 +662,8 @@ W:0:1:3:0
 C:-15:-15:0:0
 T:35:0:255
 R:100
-F:AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:SHOW_MODS
 
 # Aura, Electricity
 N:48:of Electricity
@@ -575,7 +672,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | SH_ELEC | RES_ELEC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 ### Gloves ###
 
@@ -601,7 +701,8 @@ W:0:2:10:1000
 C:0:0:0:5
 T:31:0:99
 R:100
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 
 N:52:of Power
@@ -610,9 +711,11 @@ X:A:34:22
 W:0:1:10:2500
 C:5:5:0:5
 R:100
-F:STR | SHOW_MODS | HIDE_TYPE
-f:STR
+F:HIDE_TYPE
 F:R_HIGH
+F:SHOW_MODS
+F:STR
+f:STR
 
 # 53 Gauntlets only
 N:53:of Peace
@@ -621,7 +724,8 @@ W:0:1:3:0
 C:-10:-10:0:0
 T:31:2:2
 R:100
-F:HEAVY_CURSE | CURSED
+F:CURSED
+F:HEAVY_CURSE
 
 # 54 Gloves only
 N:54:of Charming
@@ -687,7 +791,8 @@ W:0:1:27:200000
 C:0:0:0:10
 T:30:0:99
 R:100
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 R:10
 F:PVAL_M3
@@ -700,7 +805,9 @@ W:0:1:20:5000
 C:0:0:0:6
 T:30:6:6
 R:100
-F:CON | INFRA | RES_DARK
+F:CON
+F:INFRA
+F:RES_DARK
 R:33
 F:STR
 
@@ -727,7 +834,8 @@ W:0:1:3:0
 C:0:0:0:-10
 T:30:0:99
 R:100
-F:SPEED | AGGRAVATE
+F:AGGRAVATE
+F:SPEED
 
 
 ### Weapons ###
@@ -741,10 +849,16 @@ X:A:24:30
 W:0:2:44:20000
 C:6:6:4:3
 R:100
-F:WIS |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED | RES_FEAR | ESP_EVIL
-F:SUSTAIN | LIMIT_BLOWS
+F:BLESSED
+F:ESP_EVIL
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 R:10
 F:BLOWS
 R:1
@@ -761,12 +875,22 @@ X:A:24:25
 W:0:2:44:15000
 C:4:4:8:4
 R:100
-F:STEALTH |
-f:STEALTH |
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:SUSTAIN | R_HIGH
+F:FEATHER
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+f:STEALTH
 R:33
 F:RES_POIS
 
@@ -779,8 +903,10 @@ X:B:24:20
 W:0:1:44:5000
 C:0:0:0:3
 R:100
-F:WIS | ESP_GOOD
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:ESP_GOOD
+F:WIS
 f:BLESSED
 
 N:68:of Greater Life
@@ -794,7 +920,8 @@ W:0:1:50:30000
 C:5:5:0:3
 r:N:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 N:69:of Westernesse
@@ -807,9 +934,17 @@ X:A:24:20
 W:0:2:44:20000
 C:5:5:0:2
 R:100
-F:STR | DEX | CON |
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
-F:FREE_ACT | SEE_INVIS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:CON
+F:DEX
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:FREE_ACT
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 R:33
 F:RES_FEAR
 R:50
@@ -841,7 +976,8 @@ X:A:24:15
 W:0:2:44:2500
 C:0:0:0:0
 R:100
-F:SLAY_WEAP | WOUNDING
+F:SLAY_WEAP
+F:WOUNDING
 
 N:72:of Spinning
 T:125:0:255
@@ -854,7 +990,10 @@ X:A:24:18
 W:0:1:44:9000
 C:8:8:0:2
 R:100
-F:DEX | STR | VORPAL | ACTIVATE
+F:ACTIVATE
+F:DEX
+F:STR
+F:VORPAL
 a:SPIN
 
 # The "Elemental" brands (4) (6)
@@ -870,7 +1009,9 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:5000
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
+F:BRAND_ACID
+F:IGNORE_ACID
+F:RES_ACID
 f:BRAND_ACID
 
 N:74:Shocking
@@ -884,7 +1025,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4500
 R:100
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
+F:BRAND_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
 f:BRAND_ELEC
 
 N:75:Fiery
@@ -898,8 +1041,11 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:3500
 R:100
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE1
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+f:BRAND_FIRE
 
 N:76:Frozen
 T:125:0:255
@@ -912,8 +1058,10 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:3000
 R:100
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:BRAND_COLD
 
 N:77:Venomous
 T:125:0:255
@@ -926,8 +1074,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4000
 R:100
-F:BRAND_POIS | RES_POIS
-f:BRAND_POIS | 
+F:BRAND_POIS
+F:RES_POIS
+f:BRAND_POIS
 
 N:78:Chaotic
 T:125:0:255
@@ -940,9 +1089,13 @@ T:115:55:55
 X:B:24:28
 W:0:1:44:10000
 R:100
-F:CHAOTIC | RES_CHAOS | IGNORE_ELEC | IGNORE_ACID | IGNORE_FIRE
-f:CHAOTIC
+F:CHAOTIC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
 F:R_ANY
+f:CHAOTIC
 
 N:79:Sharp
 T:125:0:255
@@ -963,7 +1116,10 @@ X:A:24:20
 W:0:1:44:4000
 C:10:10:0:6
 R:100
-F:IMPACT | STR | TUNNEL | HIDE_TYPE
+F:HIDE_TYPE
+F:IMPACT
+F:STR
+F:TUNNEL
 f:IMPACT
 
 # The "Slay" brands (8)
@@ -1088,8 +1244,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:INT | SLAY_ANIMAL | SLOW_DIGEST | STEALTH | ESP_ANIMAL
-f:SLAY_ANIMAL | STEALTH
+F:ESP_ANIMAL
+F:INT
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
+F:STEALTH
+f:SLAY_ANIMAL
+f:STEALTH
 
 N:90:of *Slay Evil*
 T:125:0:255
@@ -1102,8 +1263,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:WIS | SLAY_EVIL | BLESSED | ESP_EVIL | RES_FEAR | ABILITY
-f:SLAY_EVIL | 
+F:ABILITY
+F:BLESSED
+F:ESP_EVIL
+F:RES_FEAR
+F:SLAY_EVIL
+F:WIS
+f:SLAY_EVIL
 
 N:91:of *Slay Undead*
 T:125:0:255
@@ -1117,8 +1283,12 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:WIS | KILL_UNDEAD | SEE_INVIS | ESP_UNDEAD | RES_NETHER
-f:KILL_UNDEAD | 
+F:ESP_UNDEAD
+F:KILL_UNDEAD
+F:RES_NETHER
+F:SEE_INVIS
+F:WIS
+f:KILL_UNDEAD
 
 N:92:of *Slay Demon*
 T:125:0:255
@@ -1132,8 +1302,12 @@ X:A:24:16
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:INT | KILL_DEMON | ESP_DEMON | RES_FIRE | RES_CHAOS
-f:KILL_DEMON | 
+F:ESP_DEMON
+F:INT
+F:KILL_DEMON
+F:RES_CHAOS
+F:RES_FIRE
+f:KILL_DEMON
 
 N:93:of *Slay Orc*
 T:15:0:255
@@ -1146,8 +1320,11 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:DEX | SLAY_ORC | ESP_ORC | SUST_DEX | 
-f:SLAY_ORC | 
+F:DEX
+F:ESP_ORC
+F:SLAY_ORC
+F:SUST_DEX
+f:SLAY_ORC
 
 N:94:of *Slay Troll*
 T:15:0:255
@@ -1160,8 +1337,12 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_TROLL | ESP_TROLL | REGEN | SUST_STR
-f:SLAY_TROLL | 
+F:ESP_TROLL
+F:REGEN
+F:SLAY_TROLL
+F:STR
+F:SUST_STR
+f:SLAY_TROLL
 
 N:95:of *Slay Giant*
 T:15:0:255
@@ -1174,8 +1355,12 @@ X:A:24:16
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_GIANT | ESP_GIANT | RES_SHARDS | SUST_STR
-f:SLAY_GIANT | 
+F:ESP_GIANT
+F:RES_SHARDS
+F:SLAY_GIANT
+F:STR
+F:SUST_STR
+f:SLAY_GIANT
 
 N:96:of *Slay Dragon*
 T:15:0:255
@@ -1188,9 +1373,13 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:CON | KILL_DRAGON | ESP_DRAGON | RES_FEAR | 
+F:CON
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
+F:R_ELEM
+F:R_LOW
 f:KILL_DRAGON
-F:R_LOW | R_ELEM
 R:20
 F:RES_POIS
 
@@ -1202,8 +1391,11 @@ X:B:24:25
 W:0:2:44:10000
 C:0:0:0:-2
 R:100
-F:LIFE | VAMPIRIC | HOLD_LIFE
-f:LIFE | VAMPIRIC
+F:HOLD_LIFE
+F:LIFE
+F:VAMPIRIC
+f:LIFE
+f:VAMPIRIC
 
 N:98:(*Defender*)
 T:21:0:255
@@ -1214,18 +1406,40 @@ X:A:24:35
 W:0:1:100:50000
 C:-15:-15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+F:WIS
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 N:99:of the Thunderlords
 T:21:0:255
@@ -1237,13 +1451,24 @@ W:0:1:100:7000
 C:4:4:0:2
 a:TELEPORT
 R:100
-F:SLAY_EVIL | KILL_DRAGON | TELEPORT | FREE_ACT | SEARCH | BRAND_ELEC
-F:REGEN | SLOW_DIGEST | RES_NEXUS | ACTIVATE | FLY | ESP_DRAGON
+F:ACTIVATE
+F:BRAND_ELEC
+F:ESP_DRAGON
+F:FLY
+F:FREE_ACT
+F:KILL_DRAGON
+F:REGEN
+F:RES_NEXUS
 F:R_HIGH
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:TELEPORT
 R:12
 F:ABILITY
 R:2
-F:R_P_ABILITY | PVAL_M3 | LIMIT_BLOWS
+F:LIMIT_BLOWS
+F:PVAL_M3
+F:R_P_ABILITY
 
 N:100:of Gondolin
 T:21:0:255
@@ -1254,10 +1479,21 @@ X:A:24:26
 W:0:1:44:25000
 C:7:7:0:3
 R:100
-F:STR | CON | ESP_EVIL | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_DRAGON | SLAY_DEMON |
-F:FREE_ACT | SEE_INVIS | LITE1 | RES_DARK | ABILITY | 
-F:IGNORE_ACID | IGNORE_FIRE
+F:ABILITY
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:LITE1
+F:RES_DARK
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:STR
 R:33
 F:R_HIGH
 R:33
@@ -1273,9 +1509,12 @@ X:A:24:4
 W:0:1:2:500
 C:0:0:0:5
 R:100
-F:TUNNEL |
-f:TUNNEL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:TUNNEL
+f:TUNNEL
 
 # More weapons
 
@@ -1289,8 +1528,11 @@ T:115:55:55
 X:B:24:30
 W:0:1:5:5000
 R:100
-F:SLAY_UNDEAD | SEE_INVIS | HOLD_LIFE | DRAIN_HP
 F:ACTIVATE
+F:DRAIN_HP
+F:HOLD_LIFE
+F:SEE_INVIS
+F:SLAY_UNDEAD
 a:SPECTRAL
 
 N:103:of Morgul
@@ -1304,9 +1546,15 @@ X:A:24:0
 W:0:1:1:0
 C:-20:-20:-10:-10
 R:100
+F:AGGRAVATE
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
 F:LUCK
-F:SEE_INVIS | AGGRAVATE | HEAVY_CURSE | CURSED | BLACK_BREATH | DRAIN_EXP | 
-F:AUTO_CURSE | WOUNDING
+F:SEE_INVIS
+F:WOUNDING
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 N:104:of Nothingness
@@ -1320,7 +1568,10 @@ X:A:24:0
 W:0:1:2:0
 C:-100:-100:0:0
 R:100
-F:NEVER_BLOW | HEAVY_CURSE | CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NEVER_BLOW
 
 
 ### Missile Launchers ###
@@ -1345,8 +1596,10 @@ X:A:25:20
 W:0:4:21:10000
 C:5:10:0:1
 R:100
-F:XTRA_MIGHT | PVAL_M3 | R_ANY
-f:XTRA_MIGHT | 
+F:PVAL_M3
+F:R_ANY
+F:XTRA_MIGHT
+f:XTRA_MIGHT
 
 N:108:of Extra Shots
 T:19:0:255
@@ -1354,8 +1607,9 @@ X:A:25:20
 C:10:5:0:1
 W:0:4:21:10000
 R:100
-F:XTRA_SHOTS | PVAL_M2
-f:XTRA_SHOTS | 
+F:PVAL_M2
+F:XTRA_SHOTS
+f:XTRA_SHOTS
 
 # Bows only
 N:109:of Lothlorien
@@ -1364,8 +1618,14 @@ X:A:25:20
 W:50:2:21:30000
 C:10:10:0:2
 R:100
-F:DEX | XTRA_MIGHT | FREE_ACT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | 
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
 
 # Crossbows only
 N:110:of the Haradrim
@@ -1374,7 +1634,11 @@ X:A:25:30
 W:50:2:21:20000
 C:5:15:0:1
 R:100
-F:XTRA_MIGHT | XTRA_SHOTS | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Slings only
 N:111:of Buckland
@@ -1383,7 +1647,12 @@ W:40:2:21:20000
 C:8:8:0:2
 T:19:2:2
 R:100
-F:DEX | XTRA_SHOTS | XTRA_MIGHT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 
 ### Ammo ###
@@ -1434,8 +1703,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ACID | IGNORE_ACID
-f:BRAND_ACID | 
+F:BRAND_ACID
+F:IGNORE_ACID
+f:BRAND_ACID
 W:0:1:12:30
 
 # 117 All Elements at once - melee weapon
@@ -1447,16 +1717,26 @@ T:22:0:99
 T:23:0:99
 T:24:0:99
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-F:BRAND_POIS | RES_POIS | DRAIN_MANA
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 N:118:of Slay Demon
 T:16:0:99
@@ -1491,8 +1771,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ELEC | IGNORE_ELEC
-f:BRAND_ELEC | 
+F:BRAND_ELEC
+F:IGNORE_ELEC
+f:BRAND_ELEC
 W:0:1:12:30
 
 N:122:of Flame
@@ -1501,8 +1782,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_FIRE | IGNORE_FIRE
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+f:BRAND_FIRE
 W:0:2:12:25
 
 N:123:of Frost
@@ -1511,8 +1793,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+f:BRAND_COLD
 W:0:2:12:25
 
 N:124:of Wounding
@@ -1563,9 +1846,15 @@ X:A:25:20
 W:0:2:3:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
-F:RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M2
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:RES_ACID
+F:R_ANY
+F:SEE_INVIS
 R:25
 F:PVAL_M1
 
@@ -1576,9 +1865,19 @@ X:A:25:20
 W:0:1:3:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SUST_CHR |
-F:RES_FIRE | RES_COLD | RES_ELEC | RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M3
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M3
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
+F:SEE_INVIS
+F:SUST_CHR
 R:50
 F:PVAL_M1
 R:35
@@ -1592,8 +1891,13 @@ X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | ACTIVATE
-F:R_ANY | PVAL_M2
+F:ACTIVATE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:R_ANY
 R:50
 F:PVAL_M1
 R:25
@@ -1643,7 +1947,10 @@ X:A:51:10
 W:0:1:10:10000
 C:0:0:0:0
 R:100
-F:CAPACITY | CHARGING | CHEAPNESS | FAST_CAST |
+F:CAPACITY
+F:CHARGING
+F:CHEAPNESS
+F:FAST_CAST
 
 ### Lights ###
 
@@ -1694,10 +2001,10 @@ R:100
 F:LITE1
 F:LITE2
 F:LITE3
+F:RES_DARK
 f:LITE1
 f:LITE2
 f:LITE3
-F:RES_DARK
 
 N:141:of the Shadows
 X:A:0:6
@@ -1726,7 +2033,8 @@ T:39:0:99
 W:0:3:40:4000
 C:0:0:0:0
 R:100
-F:RES_BLIND | SEE_INVIS
+F:RES_BLIND
+F:SEE_INVIS
 
 N:144:of the Ethereal Eye
 X:A:0:7
@@ -1751,9 +2059,19 @@ X:B:30:18
 W:0:2:20:5000
 C:0:0:15:2
 R:100
-F:STR | CON | INFRA | FREE_ACT | HIDE_TYPE | 
-F:RES_FEAR | RES_DARK | SUST_STR | SUST_CON | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INFRA
+F:RES_DARK
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 
 # Ring and Amulet egos
 
@@ -1764,8 +2082,14 @@ T:45:0:255
 W:0:1:10:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 
 N:148:Cursed
 X:B:0:0
@@ -1799,123 +2123,17 @@ T:65:31:255
 W:0:1:20:1000
 C:0:0:0:3
 R:100
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:50
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:10
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:1
-F:PVAL_M5 | PVAL_M3
-
-
-### Trapping Kits ###
-
-N:151:of Extra Might
-X:A:0:5
-T:46:1:3
-W:0:1:10:1000
-C:20:20:0:2
-R:100
-F:XTRA_MIGHT
-f:XTRA_MIGHT
-
-N:152:of Extra Shots
-X:A:0:10
-T:46:0:99
-W:0:1:10:2000
-C:20:20:0:3
-R:100
-F:XTRA_SHOTS
-f:XTRA_SHOTS
-
-N:153:Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:10:3000
-C:10:10:0:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_5
-f:AUTOMATIC_5
-
-N:154:Fully Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:15:5000
-C:10:10:0:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_99
-f:AUTOMATIC_99
-
-N:155:Well-hidden
-X:B:0:5
-T:46:0:99
-W:0:1:8:1000
-C:15:15:5:12
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:STEALTH | HIDE_TYPE
-f:STEALTH
-
-N:156:Complicated
-X:B:0:10
-T:46:0:99
-W:0:1:12:2000
-C:15:15:30:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE
-
-N:157:Obvious
-X:B:0:0
-T:46:0:99
-W:0:1:1:0
-C:-20:-20:-20:-20
-R:100
-F:STEALTH | CURSED | HIDE_TYPE
-f:STEALTH
-
-N:158:for Dragons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_DRAGON | HIDE_TYPE | XTRA_SHOTS |
-F:IGNORE_ACID | IGNORE_FIRE
-
-N:159:for Demons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_DEMON | HIDE_TYPE | XTRA_SHOTS
-F:IGNORE_ACID | IGNORE_FIRE
-
-N:160:for Animals
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_ANIMAL | HIDE_TYPE | XTRA_SHOTS
-
-N:161:for Undead
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_UNDEAD | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
-
-N:162:for Evil
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_EVIL | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
+F:PVAL_M3
+F:PVAL_M5
 
 # Lite ego
 N:163:of the Magi
@@ -1925,15 +2143,19 @@ W:0:1:150:2000
 C:0:0:0:3
 Z:magic map
 R:100
-F:INT | WIS | CHR
+F:CHR
+F:INT
+F:WIS
 R:60
-F:INVIS | RES_BLIND
+F:INVIS
+F:RES_BLIND
 R:30
 F:R_HIGH
 R:30
 F:PVAL_M2
 R:50:
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 ### New ego-items added by JLE
 
@@ -1945,7 +2167,8 @@ C:0:0:-50:0
 T:36:0:99
 T:37:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Vulnerability (the only cursed shield)
 N:165:of Vulnerability
@@ -1955,7 +2178,8 @@ C:0:0:-50:0
 T:115:56:56
 T:34:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Preservation -  
 N:166:of Preservation
@@ -1965,8 +2189,16 @@ C:-10:-10:20:0
 T:115:56:56
 T:34:0:99
 R:100
-F:RES_DISEN | SUST_STR | SUST_CON | SUST_DEX | HOLD_LIFE | R_HIGH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DISEN
+F:R_HIGH
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 R:33
 F:R_LOW
 R:33
@@ -1980,7 +2212,9 @@ T:32:0:6
 T:32:8:99
 T:33:0:99
 R:100
-F:RES_SOUND | RES_CONF | RES_FEAR
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
 
 # Crown of Night and Day
 N:168:of Night and Day
@@ -1988,7 +2222,12 @@ X:A:33:18
 W:35:1:15:4000
 T:33:0:99
 R:100
-F:RES_LITE | RES_DARK | LITE1 | SEE_INVIS  | RES_BLIND | IGNORE_ACID
+F:IGNORE_ACID
+F:LITE1
+F:RES_BLIND
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
 
 # Cloak of the Magi
 N:169:of the Magi
@@ -1997,9 +2236,16 @@ W:30:1:18:2000
 C:-5:-5:5:3
 T:35:0:99
 R:100
-F:INT | SPEED | SUST_INT | FREE_ACT | STEALTH | HIDE_TYPE | IGNORE_ACID
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:INT
+F:SPEED
+F:STEALTH
+F:SUST_INT
 R:30
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 # Cloak of Invisibility
 N:170:of Invisibility
@@ -2008,7 +2254,9 @@ W:40:1:18:3000
 C:0:0:10:5
 T:35:0:99
 R:100
-F:STEALTH | HIDE_TYPE | INVIS
+F:HIDE_TYPE
+F:INVIS
+F:STEALTH
 f:INVIS
 
 # Cloak of the Bat
@@ -2018,7 +2266,13 @@ W:50:1:35:3000
 C:-10:-10:10:3
 T:35:0:99
 R:100
-F:SPEED | FLY | RES_DARK | SEE_INVIS | INFRA | HIDE_TYPE | STEALTH
+F:FLY
+F:HIDE_TYPE
+F:INFRA
+F:RES_DARK
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
 
 # Leather Gloves of Thievery
 N:172:of Thievery
@@ -2027,7 +2281,12 @@ W:40:1:15:5000
 C:8:3:0:5
 T:31:1:1
 R:100
-F:DEX | SEARCH | SHOW_MODS | FEATHER | FREE_ACT | HIDE_TYPE | IGNORE_ACID
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:SHOW_MODS
 R:10
 F:SPEED
 
@@ -2038,8 +2297,14 @@ W:50:1:15:7000
 C:6:8:-20:2
 T:31:2:99
 R:100
-F:STR | CON | SHOW_MODS | AGGRAVATE | HIDE_TYPE | IGNORE_ACID | RES_FEAR | 
+F:AGGRAVATE
+F:CON
 F:DRAIN_HP
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
 R:25
 F:BLOWS
 
@@ -2049,7 +2314,8 @@ X:A:35:20
 W:0:3:27:5000
 T:30:0:99
 R:100
-F:RES_NEXUS | FEATHER
+F:FEATHER
+F:RES_NEXUS
 
 # Boots of Elvenkind (leather boots only)
 N:175:of Elvenkind
@@ -2058,7 +2324,13 @@ W:60:1:36:200000
 C:0:0:0:5
 T:30:2:3
 R:100
-F:STEALTH | SPEED | HIDE_TYPE | FEATHER | IGNORE_ACID | IGNORE_FIRE | ABILITY
+F:ABILITY
+F:FEATHER
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SPEED
+F:STEALTH
 
 # Weapon of Fury (must be big heavy type of weapon, no daggers or whips)
 N:176:of Fury
@@ -2071,8 +2343,14 @@ T:24:8:99
 T:125:0:99
 C:10:10:-20:2
 R:100
-F:STR | BLOWS | AGGRAVATE | RES_FEAR | HIDE_TYPE | 
-F:IGNORE_ACID | IGNORE_FIRE | DRAIN_MANA
+F:AGGRAVATE
+F:BLOWS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FEAR
+F:STR
 
 # Staffs of wishing
 N:177:of Plenty
@@ -2121,7 +2399,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_COLD_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:182:Dragon
 T:14:7:7
@@ -2130,7 +2411,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_ELEC_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:183:Dragon
 T:14:7:7
@@ -2139,7 +2423,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_FIRE_H
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 # Helm of water breathing
 N:184:of Water Breathing
@@ -2148,7 +2435,8 @@ C:0:0:0:2
 W:15:1:25:1000
 T:32:5:10
 R:100
-F:WATER_BREATH | IGNORE_ACID
+F:IGNORE_ACID
+F:WATER_BREATH
 f:WATER_BREATH
 
 # A second of life for non MUST2H weapons, much lower value tho
@@ -2163,7 +2451,8 @@ W:0:1:50:30000
 C:5:5:0:1
 r:F:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 # Cloak of Air
@@ -2191,7 +2480,10 @@ X:A:25:30
 W:60:5:30:30000
 C:10:15:20:2
 R:120
-F:XTRA_MIGHT | XTRA_SHOTS | REFLECT | IMMOVABLE
+F:IMMOVABLE
+F:REFLECT
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # N: serial number : ego type
 # D: description
diff --git a/lib/edit/evil.map b/lib/edit/evil.map
index a2f00914..aff2de9b 100644
--- a/lib/edit/evil.map
+++ b/lib/edit/evil.map
@@ -14,13 +14,13 @@ F:<:6:0
 F:.:88:0
 
 # Lesser Balrog
-F:b:88:0:996:0:0:0:0:0:0:2
+F:b:88:0:996:0:0:0:0:0:2
 
 # Greater Balrog
-F:B:88:0:807:0:0:0:0:0:0:2
+F:B:88:0:807:0:0:0:0:0:2
 
 # Pit Fiend
-F:P:88:0:812:0:0:0:0:0:0:2
+F:P:88:0:812:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index 5ab0cbdc..939af78e 100644
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -25,39 +25,62 @@ F:FLOOR
 
 N:1:open floor
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # 0x02 -> fountain
 N:2:fountain
 G:_:w
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The liquid here seems magical.
 
 # 0x03 --> glyph of warding
 
 N:3:glyph of warding
 G:;:y
-F:FLOOR | NOTICE | SUPPORT_LIGHT | CAN_RUN | REMEMBER
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a mighty spell of protection here.
 
 # 0x04 --> open door
 
 N:4:open door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x05 --> broken door
 
 N:5:broken door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x06 --> up stairs (perm)
 
 N:6:up staircase
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is an up staircase here.
 D:1:You cannot tunnel a stair.
 
@@ -65,60 +88,102 @@ D:1:You cannot tunnel a stair.
 
 N:7:down staircase
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a down staircase here.
 D:1:You cannot tunnel a stair.
 
 N:8:quest entrance
 G:>:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest entrance.
 
 N:9:quest exit
 G:<:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest exit.
 
 N:10:quest down level
 G:>:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:11:quest up level
 G:<:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:12:town exit
 G:>:g
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:13:shaft down
 G:>:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft down here.
 D:1:You cannot tunnel a shaft.
 
 N:14:shaft up
 G:<:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft up here.
 D:1:You cannot tunnel a shaft.
 
 # 0x0F -> empty fountain
 N:15:fountain
 G:_:D
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The fountain seems empty.
 
 N:16:web
 G:+:y
-F:CAN_PASS | NOTICE | WEB | NOTICE | TUNNELABLE
+F:CAN_PASS
+F:NOTICE
+F:NOTICE
+F:TUNNELABLE
+F:WEB
 D:1:You tunnel through the web.
 D:2:a web blocking your way
 
 # Trap -- the flags are not used by the program
 N:17:trap
 G:^:w
-F:FLOOR | NOTICE | REMEMBER
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x12 --> 0x1F -- UNUSED
 
@@ -127,8 +192,14 @@ F:FLOOR | NOTICE | REMEMBER
 N:32:door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 1)
@@ -136,8 +207,14 @@ D:1:You bash the boor.
 N:33:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 2)
@@ -145,8 +222,14 @@ D:1:You bash the boor.
 N:34:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 3)
@@ -154,8 +237,14 @@ D:1:You bash the boor.
 N:35:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 4)
@@ -163,8 +252,14 @@ D:1:You bash the boor.
 N:36:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 5)
@@ -172,8 +267,14 @@ D:1:You bash the boor.
 N:37:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 6)
@@ -181,8 +282,14 @@ D:1:You bash the boor.
 N:38:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 7)
@@ -190,8 +297,14 @@ D:1:You bash the boor.
 N:39:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 0)
@@ -199,8 +312,13 @@ D:1:You bash the boor.
 N:40:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 1)
@@ -208,8 +326,13 @@ D:1:You bash the boor.
 N:41:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 2)
@@ -217,8 +340,13 @@ D:1:You bash the boor.
 N:42:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 3)
@@ -226,8 +354,13 @@ D:1:You bash the boor.
 N:43:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 4)
@@ -235,8 +368,13 @@ D:1:You bash the boor.
 N:44:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 5)
@@ -244,8 +382,13 @@ D:1:You bash the boor.
 N:45:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 6)
@@ -253,8 +396,13 @@ D:1:You bash the boor.
 N:46:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 7)
@@ -262,8 +410,13 @@ D:1:You bash the boor.
 N:47:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x30 --> secret door
@@ -271,36 +424,55 @@ D:1:You bash the boor.
 N:48:secret door
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | DOOR
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:DOOR
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel.
 
 # 0x31 --> rubble
 
 N:49:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You dig in the rubble.
 
 # 0x32 --> magma vein
 
 N:50:magma vein
 G:%:s
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x33 --> quartz vein
 
 N:51:quartz vein
 G:%:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x34 --> magma vein + treasure
@@ -308,9 +480,14 @@ D:1:You tunnel into the quartz vein.
 N:52:magma vein
 G:%:s
 M:50
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x35 --> quartz vein + treasure
@@ -318,36 +495,55 @@ D:1:You tunnel into the magma vein.
 N:53:quartz vein
 G:%:w
 M:51
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x36 --> magma vein + known treasure
 
 N:54:magma vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x37 --> quartz vein + known treasure
 
 N:55:quartz vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x38 --> granite wall -- basic
 
 N:56:granite wall
 G:#:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x39 --> granite wall -- inner
@@ -355,9 +551,13 @@ D:1:You tunnel into the granite wall.
 N:57:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3A --> granite wall -- outer
@@ -365,9 +565,13 @@ D:1:You tunnel into the granite wall.
 N:58:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3B --> granite wall -- solid
@@ -375,110 +579,172 @@ D:1:You tunnel into the granite wall.
 N:59:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3C --> permanent wall -- basic (perm)
 
 N:60:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3D --> permanent wall -- inner (perm)
 
 N:61:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3E --> permanent wall -- outer (perm)
 
 N:62:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3F --> permanent wall -- solid (perm)
 
 N:63:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:64:explosive rune
 G:*:R
-F:FLOOR | CAN_LEVITATE | CAN_FLY | NOTICE | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:NOTICE
+F:SUPPORT_LIGHT
 D:0:This rune seems unstable.
 
 N:65:Straight Road startpoint
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:66:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:67:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:68:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:69:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:70:section of the Straight Road
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:71:section of the Straight Road (discharged)
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:72:Straight Road exit
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:73:corrupted section of the Straight Road
 G:*:D
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 74 --> shop
 
 N:74:Building
 G:1:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 # 75 --> 78 Quests index
 
 N:75:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:76:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:77:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:78:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 79 --> 83 UNSUSED
 
@@ -486,94 +752,136 @@ N:84:stream of shallow water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # -1 = player level
 N:85:pool of deep lava
 G:.:R
 E:-1d2:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the deep lava.
 
 N:86:stream of shallow lava
 G:.:r
 E:-1d1:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the shallow lava.
 
 N:87:dark pit
 G:#:D
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:0:Ohhh, it is dark and deep.
 
 N:88:dirt
 G:.:U
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:89:patch of grass
 G:.:G
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:90:ice
 G:.:W
 E:1d1:50:ICE
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 N:91:sand
 G:.:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:92:dead tree
 G:#:D
-F:CAN_FLY | CAN_PASS
-F:WALL | NO_WALK | NO_VISION | NOTICE
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the dead tree.
 D:2:a tree blocking your way
 
 N:93:ash
 G:.:s
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:94:mud
 G:.:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:95:ice wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the ice wall... #BOh chilly#w.
 D:2:an ice wall blocking your way
 
 N:96:tree
 G:#:G
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the tree.
 D:2:a tree blocking your way
 
 N:97:mountain chain
 G:^:U
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
@@ -581,9 +889,13 @@ D:2:a hard stone block blocking your way
 
 N:98:sandwall
 G:#:y
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -592,9 +904,13 @@ D:2:a sandwall blocking your way
 N:99:sandwall
 G:%:y
 M:98
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -602,16 +918,23 @@ D:2:a sandwall blocking your way
 
 N:100:sandwall with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily tunnel into the sandwall.
 D:2:a sandwall blocking your way
 
 N:101:high mountain chain
 G:^:W
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
@@ -620,46 +943,71 @@ G:.:v
 S:v:R:r:v:R:r:D
 E:1d1:40:NETHER
 F:ATTR_MULTI
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # A diggable glass wall.
 N:103:molten glass wall
 G:.:B
-F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the molten glass wall...
 D:2:a molten glass wall blocking your way
 
 N:160:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 ###### Here are the altars. ######
 
 N:161:Altar of Being
 G:0:W
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel at peace.
 
 N:162:Altar of Winds
 G:0:B
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to become a bird.
 
 N:163:Altar of Force
 G:0:R
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to fight evil.
 
 N:164:Altar of Darkness
 G:0:D
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:Images of pain and death fill your mind.
 
 N:165:Altar of Nature
 G:0:g
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel the desire to walk in a great forest.
 
 # XXX
@@ -674,20 +1022,30 @@ D:0:You feel the desire to walk in a great forest.
 # Used as a marker for random quests
 N:172:open floor
 G:.:w
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # Underground Tunnel
 N:173:Underground Tunnel
 G:#:s
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Tainted water
 N:174:stream of tainted water
 G:~:u
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 N:175:monster trap
 G:;:v
@@ -695,14 +1053,22 @@ F:FLOOR
 
 N:176:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:177:lava wall
 G:#:R
 S:R:R:r:r:U:u:R
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:The lava is far too hot to tunnel into it.
 D:2:a lava wall blocking your way
 
@@ -711,33 +1077,51 @@ G:%:v
 S:R:R:y:v:y:v:R
 E:150d2:1:HELL_FIRE
 F:ATTR_MULTI
-F:FLOOR | REMEMBER | NOTICE | PERMANENT
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:This fire is so powerful it could destroy even the most powerful artifacts.
 
 N:179:path to the next area
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the next area here.
 D:1:You cannot tunnel a path.
 
 N:180:path to the previous area
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the previous area here.
 D:1:You cannot tunnel a path.
 
 N:181:field
 G:::g
-F:FLOOR | PERMANENT | NOTICE | REMEMBER
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a field.
 
 N:182:Ekkaia, the Encircling Sea
 G:*:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:183:void
 G: :d
@@ -751,97 +1135,159 @@ N:187:pool of deep water
 G:~:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Glass wall -- can see but not pass
 N:188:glass wall
 G:.:B
-F:NO_WALK | WALL | PERMANENT | NOTICE
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This glass seems to be totaly impenetrable.
 D:2:a glass wall blocking your way
 
 # Illusion wall -- can't see but can pass
 N:189:illusion wall
 G:#:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Looks like this wall is not so real.
 
 # Grass roof
 N:190:Grass roof
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof top
 N:191:grass roof top
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof chimney
 N:192:grass roof chimney
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof
 N:193:brick roof
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof top
 N:194:brick roof top
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof chimney
 N:195:brick roof chimney
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # window
 N:196:window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # small window
 N:197:small window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # rain barrel
 N:198:rain barrel
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass with flowers
 N:199:grass with flowers
 G:;:G
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # cobblestone road
 N:200:cobblestone road
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # cobblestone with outlet
 N:201:cobblestone with outlet
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 N:202:small tree
 G:#:g
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Just to have a town entrance picture
 N:203:town
 G:*:w
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 # Underground Tunnel
 N:204:Underground Tunnel
 G:^:U
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Fire
@@ -851,58 +1297,92 @@ S:y:y:y:R:r:y:R
 E:-1d2:1:FIRE
 D:0:The blazing fire burns you!
 F:ATTR_MULTI
-F:FLOOR | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Permanent rubble -- town use
 N:206:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT | PERMANENT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:Looks like this pile of rubble is quite hard.
 
 # Rocky ground - rougher terrain.
 N:207:rocky ground
 G:.:s
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # cloud-like vapour. Floor for Eru's temple
 N:208:cloud-like vapour
 G:.:W
 S:W:B:B:W:w:W:B
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT 
-F:ATTR_MULTI | CAN_RUN | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # condensing water
 N:209:condensing water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Dense mist. Can pass through, but not see through
 N:210:dense mist
 G:#:w
 S:w:W:s:s:s:w:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT
-F:ATTR_MULTI | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You wander through the mist.
 D:1:You cannot tunnel through mist!
 
 # Hail-stone wall
 N:211:hail-stone wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the hail-stone wall.
 
 N:212:dead small tree
 G:#:D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 
 # New features for the Maps of Lord Dimwit
@@ -910,27 +1390,46 @@ F:NO_VISION
 N:213:copper pillar
 G:#:u
 S:u:u:u:o:u:u:u
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | ATTR_MULTI
+F:ATTR_MULTI
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The copper is too tough to tunnel through.
 D:2:a copper pillar blocking your way
 
 N:214:ethereal wall
 G:.:w
-F:WALL | NO_WALK | PERMANENT | NOTICE | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You can't even see your obstruction!
 D:2:an unseen force blocking your way
 
 N:215:glacial wall
 G:#:B
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the glacial wall... #BOh chilly#w.
 D:2:a hard glacial wall blocking your way
 
 N:216:battlement
 G:#:w
-F:NO_WALK | CAN_PASS | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
 D:1:You tunnel into the battlement.
 D:2:a hard stone battlement blocking your way
diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index 612bdc5c..1f97827b 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -266,7 +266,8 @@ N:29:& Blue Stone~
 G:":B
 I:40:18:0
 W:60:0:3:90000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### Edged Weapons #####
 
@@ -285,7 +286,8 @@ I:23:21:0
 W:15:0:140:350
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a long, double-edged sword with a plain hilt that could
 D:be wielded in one or two hands. It's called a "bastard sword" because in
@@ -340,8 +342,11 @@ W:70:0:180:4000
 A:70/8
 P:0:6d5:0:0:0
 F:ATTR_MULTI
-F:RES_CHAOS | CHAOTIC | SHOW_MODS
-f:RES_CHAOS | CHAOTIC
+F:CHAOTIC
+F:RES_CHAOS
+F:SHOW_MODS
+f:CHAOTIC
+f:RES_CHAOS
 D:A mighty sword which seems to be completely blunt. However, it is a conduit
 D:into the realms of pure chaos and strikes its victims with the devastating
 D:might of chaos itself whenever it connects. It gives you resistance to chaos
@@ -354,7 +359,8 @@ I:23:25:0
 W:30:0:200:775
 A:30/1:40/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This blade is lot longer, wider and heavier than a long sword. You have to
 D:wield it with two hands. This means that wielding a shield makes fighting
@@ -388,7 +394,8 @@ I:23:28:0
 W:40:0:260:850
 A:40/1
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:These weapons have been built in all sizes. They are custom-made
 D:for warriors that want to set out and kill their archenemy. These
@@ -400,7 +407,8 @@ I:23:20:0
 W:20:0:120:400
 A:20/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The katana is a long blade with only a small disk for a guard.
 D:Its hilt is long enough for two hands, though it could be used
@@ -480,7 +488,8 @@ I:21:6:0
 W:20:0:150:200
 A:20/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon has a ball linked with a chain to a wooden handle.
 D:Preferred tactic is smashing the brains of your opponent.
@@ -502,7 +511,8 @@ I:21:13:0
 W:10:0:150:353
 A:10/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon was originally used to cut corn. More warlike versions
 D:sport a large blade stuck on a wooden handle. The hinge allows it to get
@@ -514,7 +524,8 @@ I:21:18:0
 W:45:0:280:590
 A:45/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This two-handed version of the flail gives the fighter a fearsome
 D:weapon that can do a fair amount of damage.  It typically has several
@@ -536,7 +547,8 @@ I:21:5:0
 W:5:0:120:130
 A:5/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon is a club ending in a sphere. The sphere is studded
 D:with metal shards, and thus can both crush and cut your adversary.
@@ -547,7 +559,8 @@ I:21:3:0
 W:10:0:150:200
 A:10/1
 P:0:1d9:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A long, wooden pole, usually the height of the wielder. Four of them can be
 D:made out of the trunk of one young tree, hence the name. The quarterstaff
@@ -561,7 +574,8 @@ I:21:8:0
 W:5:0:120:225
 A:5/1
 P:0:3d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large hammer, designed to crush skulls with mighty strikes.
 
@@ -571,7 +585,8 @@ I:21:15:0
 W:15:0:180:502
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large, mean mace filled with lead in order to wreak a maximum of havoc.
 
@@ -581,8 +596,11 @@ I:21:20:0
 W:80:0:400:4300
 A:80/5
 P:0:5d8:0:0:0
-F:SLAY_UNDEAD | SHOW_MODS | MUST2H
-f:MUST2H | SLAY_UNDEAD
+F:MUST2H
+F:SHOW_MODS
+F:SLAY_UNDEAD
+f:MUST2H
+f:SLAY_UNDEAD
 D:This mace is custom-made for priests that go out to destroy evil.
 D:It is deadly, especially for undead.
 
@@ -592,7 +610,8 @@ I:21:10:0
 W:10:0:120:376
 A:10/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A war hammer combined with a spearpoint, mounted on a long pole.
 
@@ -604,7 +623,8 @@ I:22:10:0
 W:15:0:180:408
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This polearm has a beak mounted opposite the blade.
 
@@ -614,7 +634,8 @@ I:22:13:0
 W:20:0:190:363
 A:20/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A polearm with a long, slightly curved knife-like blade. It has spurs on
 D:the dull side of the blade. It's primarily a slashing and chopping weapon. Glaives
@@ -628,7 +649,8 @@ I:22:15:0
 W:25:0:190:430
 A:25/1
 P:0:3d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The halberd has a broad, short axe blade on a 5 - 6ft long haft, with a
 D:spearpoint at the top, often a back-spike and occasionally a butt-spike. Used to
@@ -644,7 +666,8 @@ I:22:4:0
 W:10:0:160:340
 A:10/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a polearm with a long square-sectioned spike on the end.
 
@@ -654,7 +677,8 @@ I:22:8:0
 W:15:0:160:358
 A:15/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A staff, 16-18 feet long, that has a small piercing head about 10 inches
 D:long. The pike is often used by infantry to fend off cavalry.  It is very
@@ -679,7 +703,8 @@ I:22:5:0
 W:5:0:70:120
 A:5/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The trident is based on the pitchfork.  In fact, when not used as a weapon,
 D:it is often employed as a pitchfork. It is famous for its uses in
@@ -692,7 +717,8 @@ I:22:20:0
 W:10:0:300:230
 A:10/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the original polearm. It is shaped like a spear but is bigger. It's
 D:meant to fend off enemies, not to be thrown.
@@ -703,7 +729,8 @@ I:24:25:0
 W:40:0:230:500
 A:40/1
 P:0:4d4:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A huge and heavy two-headed axe.
 
@@ -713,7 +740,8 @@ I:22:22:0
 W:15:0:170:334
 A:15/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:The Nordics' take on the halberd. The polearm of choice for many Nordics,
@@ -725,7 +753,8 @@ I:22:28:0
 W:45:0:250:750
 A:45/1
 P:0:3d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:A Nordic version of the halberd. The polearm of choice for many Nordics,
@@ -737,7 +766,8 @@ I:24:11:0
 W:15:0:160:304
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A one-headed axe made for combat, with an elongated moon-shaped blade.
 
@@ -747,7 +777,8 @@ I:22:17:0
 W:45:0:250:800
 A:45/1
 P:0:5d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A simple farm implement, converted into a weapon by slightly straightening
 D:its blade and putting it in line with its pole, instead of the typical
@@ -759,8 +790,13 @@ I:22:30:0
 W:80:0:250:10000
 A:80/20
 P:0:8d4:0:0:0
-F:SHOW_MODS | MUST2H | WOUNDING | VORPAL
-f:MUST2H | VORPAL | WOUNDING
+F:MUST2H
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
+f:MUST2H
+f:VORPAL
+f:WOUNDING
 D:The simple design of the war scythe, but this one uses a finely crafted and
 D:incredibly sharp steel blade which causes terrible wounds when it hits.
 
@@ -952,8 +988,12 @@ I:35:2:0
 W:30:0:5:1500
 A:30/4
 P:4:0d0:0:0:4
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE | IGNORE_ELEC
-F:STEALTH | SEARCH | LUCK
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LUCK
+F:STEALTH
 f:STEALTH
 D:A wonderfully light cloak coloured in brown and green hues. Its colouring
 D:greatly helps the wearer to avoid undesired attention. Wearing it makes you
@@ -1266,7 +1306,9 @@ I:35:6:1
 W:60:0:5:7500
 A:75/4
 P:6:0d0:0:0:4
-F:RES_DARK | RES_LITE | STEALTH
+F:RES_DARK
+F:RES_LITE
+F:STEALTH
 f:STEALTH
 D:A rare cloak imbued with magic to radiate a strange twilight, absorbing both
 D:extreme brightness and darkness.
@@ -1344,7 +1386,8 @@ G:=:d
 I:45:24:0
 W:30:0:2:500
 A:30/1
-F:STR | HIDE_TYPE
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This bauble magically improves your strength.
 
@@ -1353,7 +1396,8 @@ G:=:d
 I:45:26:0
 W:30:0:2:500
 A:30/1
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 D:This piece of jewellery magically improves your agility.
 
@@ -1362,7 +1406,8 @@ G:=:d
 I:45:27:0
 W:30:0:2:500
 A:30/1
-F:CON | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
 f:CON
 D:This ring magically grants you health, improving your constitution.
 
@@ -1371,7 +1416,8 @@ G:=:d
 I:45:25:0
 W:30:0:2:500
 A:30/1
-F:INT | HIDE_TYPE
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This magical piece of jewellery makes you smarter.
 
@@ -1380,19 +1426,11 @@ G:=:d
 I:45:31:0
 W:75:0:2:100000
 A:75/1
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 D:This wonderful ring grants you additional energy, allowing you to act faster.
 
-N:137:Searching
-G:=:d
-I:45:23:0
-W:5:0:2:250
-A:5/1
-F:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This ring magically improves your attention, so you can detect hidden things better.
-
 # New : It can be activated but at the cost of its destruction
 N:138:Teleportation
 G:=:d
@@ -1400,7 +1438,10 @@ I:45:4:0
 W:5:0:2:250
 A:5/1
 a:DEST_TELE
-F:CURSED | TELEPORT | EASY_KNOW | ACTIVATE
+F:ACTIVATE
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This ring will uncontrollably send you to different places at its whim.
 D:You can use its power once at your will, but it will destroy the ring.
@@ -1410,7 +1451,8 @@ G:=:d
 I:45:6:0
 W:5:0:2:250
 A:5/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This magical bauble grants you some sustenance, allowing you to subsist on less food.
 
@@ -1419,7 +1461,9 @@ G:=:d
 I:45:8:0
 W:10:0:2:250
 A:10/1
-F:RES_FIRE | IGNORE_FIRE | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:RES_FIRE
 f:RES_FIRE
 D:This piece of jewellery grants you some protection from the burning heat of fire.
 
@@ -1428,7 +1472,9 @@ G:=:d
 I:45:9:0
 W:10:0:2:250
 A:10/1
-F:RES_COLD | IGNORE_COLD | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_COLD
+F:RES_COLD
 f:RES_COLD
 D:This piece of jewellery grants you some protection from the chilling forces of cold.
 
@@ -1437,7 +1483,8 @@ G:=:d
 I:45:7:0
 W:5:0:2:200
 A:5/1
-F:FEATHER | EASY_KNOW
+F:EASY_KNOW
+F:FEATHER
 f:FEATHER
 D:When you put on this ring, you will be able to float just above the floor.
 D:It prevents you from drowning, and all your falls will be painless.
@@ -1447,7 +1494,8 @@ G:=:d
 I:45:20:0
 W:60:0:2:16000
 A:60/2
-F:RES_POIS | EASY_KNOW
+F:EASY_KNOW
+F:RES_POIS
 f:RES_POIS
 D:This magical ring grants protection from poison.
 D:It is rumoured that in deep dungeons monsters can kill you at once if you
@@ -1458,7 +1506,8 @@ G:=:d
 I:45:21:0
 W:20:0:2:1500
 A:20/1
-F:FREE_ACT | EASY_KNOW
+F:EASY_KNOW
+F:FREE_ACT
 f:FREE_ACT
 D:This magical bauble prevents you from being held.
 D:Some monsters will paralyse you and then kill you if you lack free action.
@@ -1468,7 +1517,9 @@ G:=:d
 I:45:2:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | STR | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This accursed ring will sap your strength, rendering you much weaker as long as you wear it.
 
@@ -1479,7 +1530,9 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_FIRE_4
-F:RES_FIRE | IGNORE_FIRE | ACTIVATE
+F:ACTIVATE
+F:IGNORE_FIRE
+F:RES_FIRE
 f:RES_FIRE
 D:This fiery circlet grants you protection, makes fire less dangerous and even
 D:allows you to call forth a ball of flame.
@@ -1491,7 +1544,9 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_ACID_4
-F:RES_ACID | IGNORE_ACID | ACTIVATE
+F:ACTIVATE
+F:IGNORE_ACID
+F:RES_ACID
 f:RES_ACID
 D:This magical ring is imbued with spells of devouring acid, granting protection against such
 D:assaults and the ability to shoot acid at your foes.
@@ -1503,7 +1558,9 @@ W:50:0:2:3000
 A:50/1
 a:BA_COLD_4
 P:0:0d0:0:0:15
-F:RES_COLD | IGNORE_COLD | ACTIVATE
+F:ACTIVATE
+F:IGNORE_COLD
+F:RES_COLD
 f:RES_COLD
 D:This ring is imbued with supernatural cold, which makes you less vulnerable to such effects
 D:and occasionally allows you to throw balls of ice at your foes.
@@ -1513,7 +1570,12 @@ G:=:d
 I:45:0:-5
 W:50:0:2:0
 A:50/1
-F:CURSED | TELEPORT | WIS | CHR | HIDE_TYPE | AUTO_CURSE
+F:AUTO_CURSE
+F:CHR
+F:CURSED
+F:HIDE_TYPE
+F:TELEPORT
+F:WIS
 D:This accursed ring will turn you into a bumbling fool and, in addition, magically
 D:transports you to places you never wanted to see. It can recurse itself if
 D:you leave it on too long.
@@ -1523,7 +1585,9 @@ G:=:d
 I:45:3:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | INT | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This wicked ring feeds off your intellect, magically making you stupid.
 
@@ -1556,7 +1620,10 @@ G:=:d
 I:45:1:0
 W:5:0:2:0
 A:5/1
-F:CURSED | AGGRAVATE | EASY_KNOW | AUTO_CURSE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:EASY_KNOW
 f:AGGRAVATE
 D:This faithless ring will draw opponents' attention towards its hapless owner.
 
@@ -1565,7 +1632,8 @@ G:=:d
 I:45:22:0
 W:30:0:2:340
 A:30/1
-F:SEE_INVIS | EASY_KNOW
+F:EASY_KNOW
+F:SEE_INVIS
 f:SEE_INVIS
 D:This magical piece of jewellery allows your eyes to perceive beings otherwise unseen.
 
@@ -1574,7 +1642,8 @@ G:=:d
 I:45:10:0
 W:20:0:2:400
 A:20/1
-F:SUST_STR | EASY_KNOW
+F:EASY_KNOW
+F:SUST_STR
 f:SUST_STR
 D:This magical bauble protects your physical force against attacks attempting to drain it.
 
@@ -1583,7 +1652,8 @@ G:=:d
 I:45:11:0
 W:20:0:2:400
 A:20/1
-F:SUST_INT | EASY_KNOW
+F:EASY_KNOW
+F:SUST_INT
 f:SUST_INT
 D:This magical ring protects your intellect against attempts to lower it.
 
@@ -1592,7 +1662,8 @@ G:=:d
 I:45:12:0
 W:20:0:2:400
 A:20/1
-F:SUST_WIS | EASY_KNOW
+F:EASY_KNOW
+F:SUST_WIS
 f:SUST_WIS
 D:This magical ring protects you from attempts to make you more foolish.
 
@@ -1601,7 +1672,8 @@ G:=:d
 I:45:13:0
 W:20:0:2:400
 A:20/1
-F:SUST_CON | EASY_KNOW
+F:EASY_KNOW
+F:SUST_CON
 f:SUST_CON
 D:This magical ring protects your health, making it impossible for your opponents to lower it.
 
@@ -1610,7 +1682,8 @@ G:=:d
 I:45:14:0
 W:20:0:2:400
 A:20/1
-F:SUST_DEX | EASY_KNOW
+F:EASY_KNOW
+F:SUST_DEX
 f:SUST_DEX
 D:This magical ring protects your nerves, so that you will never become clumsy.
 
@@ -1619,7 +1692,8 @@ G:=:d
 I:45:15:0
 W:20:0:2:400
 A:20/1
-F:SUST_CHR | EASY_KNOW
+F:EASY_KNOW
+F:SUST_CHR
 f:SUST_CHR
 D:This ring magically protects your beauty and charm from attempts to make you ugly.
 
@@ -1638,7 +1712,10 @@ G:":d
 I:40:6:0
 W:50:0:3:1000
 A:50/4
-F:INT | WIS | HIDE_TYPE | LITE1
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:WIS
 D:This talisman grants a sharper wit, greater insight and brightness to light dark places.
 
 N:164:Charisma
@@ -1646,25 +1723,19 @@ G:":d
 I:40:7:0
 W:30:0:3:500
 A:30/1
-F:CHR | HIDE_TYPE
+F:CHR
+F:HIDE_TYPE
 f:CHR
 D:This amulet grants beauty beyond mere looks.
 
-N:165:Searching
-G:":d
-I:40:5:0
-W:15:0:3:600
-A:15/1
-F:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
 N:166:Teleportation
 G:":d
 I:40:1:0
 W:10:0:3:250
 A:10/1
-F:CURSED | TELEPORT | EASY_KNOW
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This amulet nastily throws you all over the place.
 
@@ -1673,7 +1744,8 @@ G:":d
 I:40:3:0
 W:15:0:3:200
 A:15/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This talisman will make you hungry less quickly when worn.
 
@@ -1682,18 +1754,12 @@ G:":d
 I:40:4:0
 W:10:0:3:250
 A:10/1
-F:RES_ACID | IGNORE_ACID | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_ACID
+F:RES_ACID
 f:RES_ACID
 D:This magical talisman will make the corroding forces of acid less threatening to your health.
 
-N:169:Adornment
-G:":d
-I:40:2:0
-W:10:0:3:20
-A:10/1
-F:EASY_KNOW
-D:This amulet is not magical. It just looks good.
-
 ##### Extra armour #####
 
 N:170:& Double Ring Mail~
@@ -1713,9 +1779,17 @@ I:40:8:0
 W:70:0:3:30000
 A:70/8
 P:0:0d0:-4:-4:0
-F:INT | SUST_INT | SEARCH | SPELL_CONTAIN | WIELD_CAST
-F:FREE_ACT | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_BLIND
+F:RES_CONF
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
 D:This rare amulet is highly desirable for mages, as it makes its wearer smarter, more attentive
 D:and impervious to magics which would make their own magic-use impossible.
 
@@ -1724,8 +1798,16 @@ G:":d
 I:40:0:-5
 W:50:0:3:0
 A:50/1
-F:CURSED | STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE
-F:AUTO_CURSE | CURSE_NO_DROP
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:STR
+F:WIS
 D:This wicked amulet will drain all your abilities, turning you into a mere shadow of yourself. It
 D:is exceedingly hard to get rid of.
 
@@ -1786,7 +1868,10 @@ G:?:d
 I:70:50:0
 W:100:0:5:10000
 A:100/8
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A piece of paper inscribed with strange shifting runes. Upon reading them, they will release
 D:a blast of chaotic forces.
 
@@ -1900,14 +1985,6 @@ A:0/1
 D:This scroll shows nearby objects to you. It only makes you aware of items on the floor,
 D:however, not those carried by creatures.
 
-N:194:Trap Detection
-G:?:d
-I:70:28:0
-W:5:0:5:35
-A:5/1:10/1
-D:This scroll is very helpful, because it reveals the locations of nearby snares and traps which you
-D:might otherwise blunder into.
-
 ##### Extra ammunition #####
 
 N:195:& Sheaf Arrow~
@@ -1926,7 +2003,8 @@ I:16:2:0
 W:40:0:4:20
 A:40/2:65/1
 P:0:3d4:5:5:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:Sling bullets made from the slags of mithril smelting. They are unusually heavy, hitting
 D:with great force, and are almost imperishable.
 
@@ -1979,22 +2057,6 @@ W:5:0:5:0
 A:5/1
 D:This nasty scroll will make a loud noise, waking up foes in your vicinity.
 
-N:203:Trap Creation
-G:?:d
-I:70:7:0
-W:10:0:5:0
-A:10/1
-D:If you read this rather annoying scroll, snares and pitfalls will magically be planted all around
-D:you, ready to do nasty things to you once you walk onto them.
-
-N:204:Trap/Door Destruction
-G:?:d
-I:70:39:0
-W:10:0:5:50
-A:10/1
-D:A very specifically destructive spell is written on this scroll. It will smash all traps and all
-D:doors immediately next to you.
-
 N:205:Artifact Creation
 G:?:d
 I:70:52:0
@@ -2562,8 +2624,11 @@ I:71:60:100
 W:20:0:4:250
 A:20/1:45/1:80/1:100/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 F:FOUNTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This great potion infuses you with the power of the elements, so that you can better
 D:withstand their ravages.
 
@@ -2770,8 +2835,12 @@ W:127:0:4:0
 A:127/255
 P:0:1d1:0:0:0
 T:39:2
-F:NORM_ART | FULL_NAME | SPECIAL_GENE | EASY_USE
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:SPECIAL_GENE
 a:ETERNAL_FLAME
 D:An impossibly bright, flickering living flame. It can be used
 D:once to imbue an object with the power of Eru Iluvatar himself.
@@ -2782,7 +2851,9 @@ I:23:34:0
 W:0:0:7:10
 A:0/1:5/1:10/1:20/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | VAMPIRIC | SPECIAL_GENE
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:VAMPIRIC
 D:This looks like some animal's teeth or at least you think
 D:it comes from an animal...
 
@@ -2794,7 +2865,12 @@ W:50:10:10:12000
 P:0:1d4:0:0:0
 A:50/200
 T:55:8
-F:NO_RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME | SPECIAL_GENE
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:NO_RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:This horn was given to you as a reward. Blow it if you are in dire need
 D:of leaving your current location fast.
 
@@ -2852,13 +2928,6 @@ W:30:0:50:100
 A:30/1
 P:0:1d2:0:0:0
 
-N:307:Disarm
-G:_:d
-I:55:8:-1:SPELL=Disarm
-W:2:0:50:100
-A:2/1
-P:0:1d2:0:0:0
-
 N:308:Teleportation
 G:_:d
 I:55:9:-1:SPELL=Teleportation
@@ -2970,7 +3039,8 @@ I:111:0:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The bright blue cover of this tome seems to glow
 D:with an inner violet light. You feel more attuned
 D:to raw magic as you hold it.
@@ -2981,7 +3051,9 @@ I:111:1:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:The cover of this tome is bright red, with flickering
 D:flames dancing across it once in a while. As you hold
 D:it, you begin to gain a much closer knowledge of all
@@ -2993,7 +3065,9 @@ I:111:2:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ELEC
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ELEC
 D:The pages of this tome have a tendency to turn themselves,
 D:as though flipped by an errant wind. As you hold it,
 D:you start feeling wind at your fingertips.
@@ -3004,7 +3078,9 @@ I:111:3:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ACID
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
 D:The solid leather cover of this tome seems permanently
 D:stained with caked mud and grass. Heavy it is to lift,
 D:yet strangely comforting to hold - you feel stronger
@@ -3016,7 +3092,8 @@ I:111:4:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover and pages of this tome seem to be perpetually
 D:wet, though they are not wet to the touch. As you hold
 D:it, you begin to understand ocean storms better.
@@ -3027,7 +3104,8 @@ I:111:5:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book seems to flicker strangely. It's one of those books
 D:with an annoying tendency to disappear when you need it and
 D:reappear in the unlikeliest places. As you hold it, you start
@@ -3039,7 +3117,8 @@ I:111:6:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome is a bright shade of green, and it gives off
 D:a healthy, zesty scent that makes your thoughts clearer. As you
 D:hold it, your heart goes out to all living things upon Arda.
@@ -3050,7 +3129,8 @@ I:111:7:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A thick book with solid leather binding. It looks entirely 
 D:unremarkable, but as you hold it, you feel strangely able 
 D:to learn the inner workings of things and creatures.
@@ -3129,8 +3209,11 @@ I:39:0:0:4000
 W:1:0:30:2
 A:1/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | LITE1 | FUEL_LITE
-f:LITE1 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:LITE1
+f:FUEL_LITE
+f:LITE1
 D:A piece of wood with an oily rag wrapped around it. When lit, it will give off a little light and
 D:much smoke.
 
@@ -3140,8 +3223,12 @@ I:39:1:0:7500
 W:3:0:50:35
 A:3/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2 | FUEL_LITE
-f:LITE2 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:IGNORE_FIRE
+F:LITE2
+f:FUEL_LITE
+f:LITE2
 D:A brass container with a wick emerging from it, protected from draughts by a sheet of greased
 D:paper. It can be carried by a handle.
 
@@ -3182,22 +3269,6 @@ A:15/1
 P:0:1d1:0:0:0
 D:When fuelled with enough ambient mana, this rod can detect nearby passages.
 
-N:352:Trap Location
-G:-:d
-I:66:29:8
-W:5:0:15:100
-A:5/1:10/1:20/1
-P:0:1d1:0:0:0
-D:Zapping this rod will release a minor detection magic, alerting you of nearby pits and snares.
-
-N:353:Probing
-G:-:d
-I:66:7:50
-W:40:0:15:4000
-A:40/4
-P:0:1d1:0:0:0
-D:A rod of knowledge which will tell you about nearby creatures' health.
-
 N:354:Recall
 G:-:d
 I:66:3:80
@@ -3287,14 +3358,6 @@ A:45/2
 P:0:1d1:0:0:0
 D:This rod of movement will displace its target to another location.
 
-N:365:Disarming
-G:-:d
-I:66:14:50
-W:35:0:15:2100
-A:35/1
-P:0:1d1:0:0:0
-D:This rod will clear a path for you, triggering and thus rendering harmless all traps on the way.
-
 N:366:Lightning Balls
 G:-:d
 I:66:25:50
@@ -3399,7 +3462,8 @@ G:=:d
 I:45:58:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This ring is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell into it.
@@ -3411,7 +3475,8 @@ G:":d
 I:40:27:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This amulet is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell into it.
@@ -3514,9 +3579,14 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_ACID
-F:RES_ACID | FLY |
-f:RES_ACID |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+f:RES_ACID
 D:An armour made of a black dragon's hide, containing some of this beast's powers.
 
 N:401:& Blue Dragon Scale Mail~
@@ -3526,9 +3596,14 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_ELEC
-F:RES_ELEC | FLY |
-f:RES_ELEC |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ELEC
+f:RES_ELEC
 D:A piece of dragon hide fashioned into an armour, shimmering bright blue.
 
 N:402:& White Dragon Scale Mail~
@@ -3538,9 +3613,14 @@ W:50:0:200:40000
 A:50/8
 a:BR_COLD
 P:30:2d4:-2:0:10
-F:RES_COLD | FLY |
-f:RES_COLD |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+f:RES_COLD
 D:An armour fashioned from dragon hide, glistening the white of snow.
 
 N:403:& Red Dragon Scale Mail~
@@ -3550,9 +3630,14 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_FIRE
-F:RES_FIRE | FLY |
-f:RES_FIRE |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_FIRE
+f:RES_FIRE
 D:The skin of a dragon made into a suit of armour. It glows a bright red and radiates heat.
 
 N:404:& Green Dragon Scale Mail~
@@ -3562,9 +3647,14 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_POIS
-F:RES_POIS | FLY |
-f:RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_POIS
+f:RES_POIS
 D:A suit of armour fashioned of dragon hide. It is dirty green and smells awful.
 
 N:405:& Multi-Hued Dragon Scale Mail~
@@ -3574,10 +3664,23 @@ W:90:0:200:150000
 A:90/32
 P:30:2d4:-2:0:10
 a:BR_MANY
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | FLY |
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
+f:RES_POIS
 D:A powerful armour made of dragonhide. It glows red, blue, green, black and white.
 
 N:406:& Pseudo Dragon Scale Mail~
@@ -3587,8 +3690,14 @@ W:70:0:200:70000
 A:70/16
 P:30:2d4:-2:0:10
 a:BR_LIGHT
-F:RES_LITE | RES_DARK | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DARK
+F:RES_LITE
 D:A suit of armour made of dragon hide, glowing with a strange light, or is it darkness?
 
 N:407:& Law Dragon Scale Mail~
@@ -3598,8 +3707,14 @@ W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
 a:BR_SHARD
-F:RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
+F:RES_SOUND
 D:A piece of dragonhide cut and shaped so it can be worn as armour. The scales are very sharp,
 D:and the roaring of a storm seems to come from it, but you're not afraid of either.
 
@@ -3610,8 +3725,13 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_CONF
-F:RES_CONF | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CONF
 D:A suit of armour made from dragon skin. Its brownish scales glitter in a dazzling light.
 
 N:409:& Gold Dragon Scale Mail~
@@ -3621,8 +3741,13 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_SOUND
-F:RES_SOUND | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SOUND
 D:A suit of golden-hued armour made of dragonhide. The rustle of its scales occasionally
 D:increases to a loud boom.
 
@@ -3633,10 +3758,16 @@ W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
 a:BR_CHAOS
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_CHAOS | RES_DISEN | FLY |
-f:RES_CHAOS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+f:RES_CHAOS
 D:A suit of armour made of dragon hide. It glows in colours you have never seen before. As you
 D:put it on, you feel like you could change the world and are no longer afraid of your equipment
 D:losing its magic.
@@ -3648,8 +3779,16 @@ W:95:0:200:100000
 A:95/32
 P:30:2d4:-2:0:10
 a:BR_BALANCE
-F:RES_CHAOS | RES_DISEN | RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of the hide of a dead dragon. When wearing it, you feel like you
 D:understand the principles of law and chaos, and no longer fear either.
 
@@ -3660,11 +3799,27 @@ W:100:0:250:350000
 A:100/64
 P:40:2d4:-3:0:15
 a:BR_POWER
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK |
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of a very thick richly coloured dragonhide. You think you'll never have
 D:to fear dragons if you put it on.
 
@@ -3676,7 +3831,10 @@ I:32:7:0
 W:45:0:50:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:An iron helmet, covered with a layer of dragonhide. It offers great protection and may grant
 D:protection against some dragon's attacks, based on the dragon the hide was taken from.
 
@@ -3686,7 +3844,10 @@ I:34:6:0
 W:70:0:100:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A large shield, with a dragonskin cover. Depending on which dragon the hide came from, it
 D:might grant protection against some sorts of dragon breath.
 
@@ -3751,15 +3912,6 @@ P:0:1d1:0:0:0
 D:This wonderful potion will fully heal you no matter how badly you're hurt, allow drained
 D:abilities to recover and remove various other ailments.
 
-N:421:Self Knowledge
-G:!:d
-I:71:58:0
-W:40:0:4:2000
-A:40/1
-P:0:1d1:0:0:0
-F:FOUNTAIN
-D:A drink of insight, letting you know yourself better.
-
 N:422:*Enlightenment*
 G:!:d
 I:71:57:0
@@ -3778,8 +3930,9 @@ G:=:d
 I:45:38:0
 W:10:0:2:300
 A:10/2
-F:RES_FEAR | EASY_KNOW
-f:RES_FEAR |
+F:EASY_KNOW
+F:RES_FEAR
+f:RES_FEAR
 D:This ring grants courage, so that you can never become afraid.
 
 N:426:Light and Darkness Resistance
@@ -3787,8 +3940,11 @@ G:=:d
 I:45:39:0
 W:30:0:2:3000
 A:30/2
-F:RES_LITE | RES_DARK | EASY_KNOW
-f:RES_LITE | RES_DARK |
+F:EASY_KNOW
+F:RES_DARK
+F:RES_LITE
+f:RES_DARK
+f:RES_LITE
 D:This ring protects against fluctuations of the light.
 
 N:427:Nether Resistance
@@ -3796,8 +3952,10 @@ G:=:d
 I:45:40:0
 W:34:0:2:14500
 A:34/2
-F:RES_NETHER | HOLD_LIFE | EASY_KNOW
-f:RES_NETHER |
+F:EASY_KNOW
+F:HOLD_LIFE
+F:RES_NETHER
+f:RES_NETHER
 D:This blessed ring improves your life force, protecting you from the draining forces of nether
 D:and other attempts to suck your lifeblood.
 
@@ -3806,8 +3964,9 @@ G:=:d
 I:45:41:0
 W:24:0:2:3000
 A:24/2
-F:RES_NEXUS | EASY_KNOW
-f:RES_NEXUS |
+F:EASY_KNOW
+F:RES_NEXUS
+f:RES_NEXUS
 D:This ring of stability protects you from the warping forces of nexus.
 
 N:429:Sound Resistance
@@ -3815,8 +3974,9 @@ G:=:d
 I:45:42:0
 W:26:0:2:3000
 A:26/2
-F:RES_SOUND | EASY_KNOW
-f:RES_SOUND |
+F:EASY_KNOW
+F:RES_SOUND
+f:RES_SOUND
 D:This ring projects an aura of quiet around you, protecting you from loud noise.
 
 N:430:Confusion Resistance
@@ -3824,8 +3984,9 @@ G:=:d
 I:45:43:0
 W:22:0:2:3000
 A:22/2
-F:RES_CONF | EASY_KNOW
-f:RES_CONF |
+F:EASY_KNOW
+F:RES_CONF
+f:RES_CONF
 D:This ring stabilises your mind, protecting you from all kinds of befuddlement.
 
 N:431:Shard Resistance
@@ -3833,8 +3994,9 @@ G:=:d
 I:45:44:0
 W:25:0:2:3000
 A:25/2
-F:RES_SHARDS | EASY_KNOW
-f:RES_SHARDS |
+F:EASY_KNOW
+F:RES_SHARDS
+f:RES_SHARDS
 D:This piece of jewellery magically toughens your skin, protecting you from flying shrapnel.
 
 N:432:Disenchantment Resistance
@@ -3842,8 +4004,9 @@ G:=:d
 I:45:45:0
 W:90:0:2:15000
 A:90/10
-F:RES_DISEN | EASY_KNOW
-f:RES_DISEN |
+F:EASY_KNOW
+F:RES_DISEN
+f:RES_DISEN
 D:This rare ring of preservation protects your equipment from attempts to sap its magic, also
 D:causing you to suffer less pain from such attacks.
 
@@ -3852,8 +4015,10 @@ G:=:d
 I:45:46:0
 W:50:0:2:13000
 A:50/2
-F:RES_CHAOS | RES_CONF | EASY_KNOW
-f:RES_CHAOS |
+F:EASY_KNOW
+F:RES_CHAOS
+F:RES_CONF
+f:RES_CHAOS
 D:This ring protects you from the horribly warping forces of chaos.
 
 N:434:Blindness Resistance
@@ -3861,8 +4026,9 @@ G:=:d
 I:45:47:0
 W:60:0:2:7500
 A:60/2
-F:RES_BLIND | EASY_KNOW
-f:RES_BLIND |
+F:EASY_KNOW
+F:RES_BLIND
+f:RES_BLIND
 D:This ring magically preserves your eyesight, making you impervious to any attempt to blind
 D:you.
 
@@ -3871,8 +4037,14 @@ G:=:d
 I:45:48:0
 W:100:0:2:100000
 A:100/5
-F:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
-f:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
+F:FREE_ACT
+F:HOLD_LIFE
+F:RES_DISEN
+F:RES_POIS
+f:FREE_ACT
+f:HOLD_LIFE
+f:RES_DISEN
+f:RES_POIS
 D:This blessed ring will protect you from disenchantment, poison, attempts to drain your life
 D:force and holding magic.
 
@@ -3956,7 +4128,10 @@ I:17:3:0
 W:55:0:2:35
 A:50/4:90/2
 P:0:3d4:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:An arrow to be shot with a bow, its iron head coated with hallowed silver,
 D:a material that sears the flesh of all evil creatures.
 
@@ -3966,7 +4141,10 @@ I:18:3:0
 W:50:0:2:40
 A:60/4:95/2
 P:0:3d5:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:This crossbow bolt has a silver tip, blessed by the Valar for fighting evil.
 
 N:467:Lightning Resistance
@@ -3974,8 +4152,10 @@ G:":d
 I:40:29:0
 W:10:0:3:250
 A:10/1
-F:RES_ELEC | IGNORE_ELEC | EASY_KNOW
-f:RES_ELEC |
+F:EASY_KNOW
+F:IGNORE_ELEC
+F:RES_ELEC
+f:RES_ELEC
 D:This amulet will protect you from electrical discharges and storms.
 
 N:468:Wisdom
@@ -3983,8 +4163,10 @@ G:":d
 I:40:28:0
 W:30:0:3:500
 A:30/1
-F:WIS | SUST_WIS | HIDE_TYPE
-f:WIS |
+F:HIDE_TYPE
+F:SUST_WIS
+F:WIS
+f:WIS
 D:This magical amulet will magically make you wiser, and fend off
 D:attacks that would reduce your wisdom. Beware: if cursed, the
 D:amulet will do the opposite.
@@ -3994,8 +4176,9 @@ G:":d
 I:40:30:0
 W:30:0:3:600
 A:30/3
-F:REGEN | EASY_KNOW
-f:REGEN |
+F:EASY_KNOW
+F:REGEN
+f:REGEN
 D:Wearing this amulet will trigger your body's regenerational
 D:processes quicker and make them proceed faster.
 
@@ -4004,8 +4187,9 @@ G:":d
 I:40:26:0
 W:10:0:3:200
 A:10/1
-F:INFRA | HIDE_TYPE
-f:INFRA |
+F:HIDE_TYPE
+F:INFRA
+f:INFRA
 D:This amulet will increase your ability to sense warm-blooded
 D:creatures in your vicinity. Beware: if cursed, it will do
 D:just the opposite.
@@ -4015,8 +4199,16 @@ G:":d
 I:40:25:0
 W:70:0:3:30000
 A:70/8
-F:WIS | CHR | SUST_WIS | SUST_CHR | LITE1 | HIDE_TYPE |
-F:RES_DARK | RES_LITE | RES_FIRE | HOLD_LIFE |
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 D:This blessed amulet will protect your wisdom and charms from
 D:diminishing, often adding to them as well. It also grants
 D:some extra protective magics by the grace of the Valar.
@@ -4026,8 +4218,14 @@ G:":d
 I:40:24:0
 W:70:0:3:30000
 A:70/8
-F:STR | CON | SUST_STR | SUST_CON | FREE_ACT | HIDE_TYPE |
-F:RES_FEAR | RES_DISEN |
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DISEN
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The ultimate amulet for a warrior, it will grant protection
 D:in the face of some evil magics, protect your strength and health,
 D:also increasing them. Beware: if cursed, the amulet will
@@ -4038,8 +4236,14 @@ G:":d
 I:40:23:0
 W:70:0:3:30000
 A:70/8
-F:DEX | SUST_DEX | STEALTH | SPEED | INFRA | HIDE_TYPE |
-F:RES_NEXUS | RES_POIS
+F:DEX
+F:HIDE_TYPE
+F:INFRA
+F:RES_NEXUS
+F:RES_POIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:The ultimate amulet for a rogue or assassin, it protects the
 D:wearer against some evil magics, granting improvements in
 D:the abilities vital to these adventurers. Beware: if cursed,
@@ -4050,9 +4254,12 @@ G:":d
 I:40:22:0
 W:50:0:3:25000
 A:50/6
-F:ESP_ALL |
-f:ESP_ALL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ALL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:ESP_ALL
 D:This rare and powerful amulet lays bare the minds of monsters
 D:before the wearer.
 
@@ -4061,9 +4268,19 @@ G:":d
 I:40:21:0
 W:60:0:3:20000
 A:60/4
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:HOLD_LIFE | SLOW_DIGEST | EASY_KNOW |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SLOW_DIGEST
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:This blessed amulet will make the wearer impervious to evil magics
 D:that would sap innate abilities. It also slows down the digestive
 D:system, making food less necessary on long journeys.
@@ -4099,7 +4316,8 @@ N:479:& Ring~
 G:=:d
 I:45:57:0
 W:70:0:2:65000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### And here starts the gold/gems #####
 
@@ -4205,7 +4423,10 @@ G:\:D
 I:21:50:0
 W:15:0:200:1000
 P:0:3d9:0:0:0
-F:SHOW_MODS | INSTA_ART | MUST2H | SPECIAL_GENE
+F:INSTA_ART
+F:MUST2H
+F:SHOW_MODS
+F:SPECIAL_GENE
 f:MUST2H
 
 N:499:& Massive Iron Crown~
@@ -4213,7 +4434,8 @@ G:]:D
 I:33:50:0
 W:44:0:20:1000
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 ##### Objects 500 to 511 are "Special Artifacts" #####
@@ -4317,7 +4539,8 @@ N:508:& Ring~
 G:=:d
 I:45:34:0
 W:80:0:2:100000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # The Ring of Power 'Nenya' -- see artifact list
 
@@ -4360,9 +4583,13 @@ G:":d
 I:40:9:0
 W:60:0:3:30000
 A:60/4
-F:REFLECT | EASY_KNOW
-f:REFLECT |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REFLECT
+f:REFLECT
 D:This wondrous amulet will magically make the wearer
 D:reflect arrows and bolts launched by adversaries.
 
@@ -4373,9 +4600,12 @@ G:":d
 I:40:13:0
 W:40:0:3:30000
 A:40/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_MAGIC
 f:NO_MAGIC
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet wards off magic of any kind, good or bad.
 
 N:522:Anti-Teleportation
@@ -4383,9 +4613,12 @@ G:":d
 I:40:14:0
 W:30:0:3:15000
 A:30/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_TELE
 f:NO_TELE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet will prevent the space-time continuum from
 D:being disrupted around the wearer.
 
@@ -4396,9 +4629,18 @@ G:":d
 I:40:15:0
 W:50:0:3:25000
 A:50/4
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 D:This amulet will make the wearer resist the elements.
 
 ##### New arms #####
@@ -4409,7 +4651,8 @@ I:23:29:0
 W:40:0:280:580
 A:40/3
 P:0:4d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This great sword of foreign origin is approximately 6 feet long. The hilt is
 D:long enough for even four hands to grip. A mighty weapon for a warrior.
@@ -4421,7 +4664,9 @@ I:39:3:0
 W:15:0:50:5000
 A:15/2
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE2
 f:LITE2
 D:Made by the dwarves, this lantern provides light in the
 D:darkest recesses of the earth.
@@ -4442,7 +4687,9 @@ I:39:2:0
 W:5:0:50:2500
 A:5/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE1
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE1
 f:LITE1
 D:This enchanted torch never needs to be fuelled.
 
@@ -4473,7 +4720,9 @@ I:39:4:0
 W:25:0:50:15000
 A:25/3
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE3
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE3
 f:LITE3
 D:Made by the descendants of the Noldo craftsman, this lamp
 D:contains a part of the flame which burned inside Feanor.
@@ -4502,7 +4751,8 @@ I:24:1:0
 W:10:0:60:120
 A:10/2
 P:0:1d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a large axe that could be wielded in one or two hands.  It has
 D:a single blade with a pick on the reverse, designed for armour piercing.
@@ -4580,7 +4830,8 @@ I:23:26:0
 W:40:0:230:600
 A:40/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A large, two-handed sword with a blade that weaves
 D:left and right until it reaches the hilt.
@@ -4591,7 +4842,8 @@ I:23:23:0
 W:40:0:200:600
 A:40/2
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Also known as a Claidhmore, or Greatsword, this weapon is favoured
 D:by powerful mercenaries. The blade is large, straight, and broad,
@@ -4603,7 +4855,8 @@ I:23:24:0
 W:40:0:200:600
 A:40/3
 P:0:2d9:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the strictly two-handed version of the bastard sword.
 D:The blade is of medium length, double-edged, and considerably
@@ -4615,39 +4868,20 @@ I:23:22:0
 W:40:0:240:500
 A:40/3
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a larger version of the curved oriental blade.
 D:Runes of war decorate its golden hilt.
 
-
-### Trapping Kits
-
-N:549:Arrow
-G:`:r
-I:46:2:0
-W:10:0:60:150
-A:10/2:50/2
-F:SHOW_MODS
-D:It must be loaded with arrows, which will be
-D:fired at the monster who triggers the trap.
-
-N:550:Bolt
-G:`:o
-I:46:3:0
-W:20:0:220:300
-A:20/2:50/2
-F:SHOW_MODS
-D:It must be loaded with crossbow bolts, which will
-D:be fired at the monster who triggers the trap.
-
 N:551:& Fauchard~
 G:/:s
 I:22:6:0
 W:18:0:155:301
 A:18/2
 P:0:1d10:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It is a type of glaive with two ornate hooks on the back
 D:of the blade. It is typically 8 to 9 feet long.
@@ -4658,7 +4892,8 @@ I:22:16:0
 W:21:0:165:320
 A:21/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Mounted on a long shaft for maximum reach, this weapon is
 D:effective at repelling both cavalry and infantry.
@@ -4669,7 +4904,8 @@ I:22:29:0
 W:43:0:400:700
 A:43/2
 P:0:4d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a shock weapon. Its purpose is to unhorse a rider
 D:in single combat, or smash through the armour of opposing lines.
@@ -4685,17 +4921,6 @@ D:This is a two-edged dagger with a long blade. A favourite among travellers
 D:and warriors alike, it can be worn comfortably with plain clothes
 D:as well as armour.
 
-### Trapping Kits
-
-N:555:Catapult
-G:`:R
-I:46:1:0
-W:1:0:50:40
-A:1/2:20/2
-F:SHOW_MODS
-D:It must be loaded with sling bullets, which will
-D:be fired at the monster who triggers the trap.
-
 N:556:& Ring Mail~
 G:[:s
 I:37:2:0
@@ -4732,16 +4957,6 @@ P:4:1d1:0:0:0
 D:Heavy, multi-layered cloth sewn together to cover the body,
 D:with extra padding between layers.
 
-### Trapping Kits
-
-N:560:Fumes
-G:`:G
-I:46:4:0
-W:2:0:20:50
-A:2/2:30/2
-D:It must be loaded with potions, which will splatter
-D:over the monster who triggers the trap.
-
 N:561:& Stone and Hide Armour~
 G:(:U
 I:36:15:0
@@ -4750,26 +4965,6 @@ A:35/7
 P:15:1d1:-1:0:0
 D:A primitive armour made from a thick hide reinforced by stone shards.
 
-### Trapping Kits
-
-N:562:Magic
-G:`:g
-I:46:5:0
-W:5:0:20:50
-A:5/2:40/2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-D:It must be loaded with scrolls, which will release
-D:their spells at the monster who triggers the trap.
-
-N:563:Device
-G:`:v
-I:46:6:0
-W:20:0:20:50
-A:20/2:40/2:60/2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-D:It must be loaded with a magic device (wand, staff, or rod), which
-D:will fire its spell at the monster who triggers the trap.
-
 N:564:Nothing
 G:?:d
 I:70:53:0
@@ -4784,7 +4979,8 @@ I:65:2:-1:SPELL=Nothing
 W:2:0:10:20
 A:2/1
 P:0:1d1:0:0:0
-F:NO_RECHARGE | SPECIAL_GENE
+F:NO_RECHARGE
+F:SPECIAL_GENE
 
 N:567:Nothing
 G:=:d
@@ -4799,7 +4995,8 @@ I:55:30:0
 W:5:0:50:50
 A:5/1
 P:0:1d1:0:0:0
-F:NO_RECHARGE | SPECIAL_GENE
+F:NO_RECHARGE
+F:SPECIAL_GENE
 
 N:569:Nothing
 G:-:d
@@ -4811,8 +5008,6 @@ P:0:1d1:0:0:0
 
 # Amulet of Nothing
 
-# FIXME: Could remove "of Nothing" (amulets, rings, rods)
-
 N:572:Nothing
 G:":d
 I:40:16:0
@@ -4829,7 +5024,8 @@ W:70:0:4:10000
 A:70/16
 P:0:1d1:0:0:0
 T:71:2
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:Quaffing this measure of living blood will imbue your body and soul
 D:with the power to escape death one time.
 
@@ -4841,7 +5037,8 @@ I:6:1:0
 W:5:0:12:300
 A:5/1:20/1:50/1:80/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It looks like a simple walking stick, plain and nondescript.
 D:In the hands of a spellcaster, it can be a deadly weapon.
@@ -4855,8 +5052,10 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_ELEC_4
-F:RES_ELEC | IGNORE_ELEC | ACTIVATE
-f:RES_ELEC |
+F:ACTIVATE
+F:IGNORE_ELEC
+F:RES_ELEC
+f:RES_ELEC
 D:This sparkling circlet grants you protection, makes electricity less
 D:dangerous and even allows you to call forth a ball of lightning.
 
@@ -4898,8 +5097,9 @@ G:=:d
 I:45:53:4
 W:50:0:2:10000
 A:50/1
-F:INVIS | HIDE_TYPE
-f:INVIS |
+F:HIDE_TYPE
+F:INVIS
+f:INVIS
 D:This magical bauble will hide you from sight.
 
 ######### Here are the parchments ########
@@ -5048,7 +5248,8 @@ I:72:1:0
 W:5:0:4:100
 A:1/3:5/1:10/1
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This concoction can transform your body for a short period of time.
 
 # XXX 606 -> 617
@@ -5121,7 +5322,8 @@ I:36:16:0
 W:5:0:60:400
 A:25/1
 P:9:1d1:0:0:0
-F:RES_FIRE | RES_COLD |
+F:RES_COLD
+F:RES_FIRE
 D:This suit of thick impregnated cloth is worn by the riders of flying steeds,
 D:and protects them from extremes of temperatures.
 
@@ -5130,7 +5332,8 @@ N:647:& Stone~
 G:~:g
 I:39:106:0
 W:15:0:15:20000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # Here are the boomerangs
 
@@ -5258,7 +5461,9 @@ G:~:o
 I:102:0:0
 W:1:0:50:0
 A:1/1:10/1:20/1:30/1
-F:INSTA_ART | ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:INSTA_ART
 
 N:663:Craftsmanship
 G:?:d
@@ -5287,7 +5492,9 @@ I:14:60:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CON | ACTIVATE | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:WIELD_CAST
 D:A simple wind instrument made from brass. If used by inexperienced musicians it sounds
 D:like somebody making "prbbt!" noises down a drainpipe.
 
@@ -5297,7 +5504,8 @@ I:14:58:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:STR | WIELD_CAST
+F:STR
+F:WIELD_CAST
 D:A sort of clay pot with a bit of skin stretched over its mouth.
 
 N:671:& Harp~
@@ -5306,7 +5514,8 @@ I:14:59:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CHR | WIELD_CAST
+F:CHR
+F:WIELD_CAST
 D:A number of strings held by a wooden frame.
 
 #N:672:& Banjo~
@@ -5350,7 +5559,8 @@ I:10:1:0
 W:5:0:30:100
 A:5/1:15/1:25/1:35/1
 P:0:1d1:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
 
 ### Two more scrolls ###
 
@@ -5370,160 +5580,6 @@ A:30/1:45/1:55/1
 D:This scroll is inscribed with a ritual which allows you to discern what fate holds in store for
 D:you.
 
-### Here comes the Runes ###
-
-N:679:Self
-G:?:b
-I:105:0:0
-W:3:5:2:40
-A:3/1
-P:0:1d1:0:0:0
-
-N:680:Ray
-G:?:b
-I:105:2:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC
-
-N:681:Sphere
-G:?:b
-I:105:3:0
-W:15:5:2:1000
-A:15/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:682:Knowledge
-G:?:b
-I:104:91:0
-W:6:5:2:200
-A:6/1
-P:0:1d1:0:0:0
-
-N:683:Life
-G:?:D
-I:104:53:0
-W:3:5:2:200
-A:3/1
-P:0:1d1:0:0:0
-
-N:684:Fire
-G:?:r
-I:104:5:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_FIRE
-
-N:685:Cold
-G:?:b
-I:104:4:0
-W:12:5:2:300
-A:12/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD
-
-N:686:Lightning
-G:?:W
-I:104:1:0
-W:13:5:2:300
-A:13/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:687:Acid
-G:?:B
-I:104:3:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:688:Element
-G:?:g
-I:104:10:0
-W:23:5:2:1000
-A:23/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:689:Chaos
-G:?:v
-I:104:30:0
-W:26:5:2:2000
-A:26/1
-P:0:1d1:0:0:0
-F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:690:Mind
-G:?:D
-I:104:85:0
-W:19:5:2:3000
-A:19/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:691:Holding
-G:?:B
-I:104:75:0
-W:5:5:2:500
-A:5/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:692:Arrow
-G:?:b
-I:105:1:0
-W:6:5:2:100
-A:6/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:693:Power Surge
-G:?:b
-I:105:4:0
-W:50:5:2:5000
-A:50/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID
-
-N:694:Armageddon
-G:?:b
-I:105:5:0
-W:30:5:2:4000
-A:30/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID
-
-N:695:Gravity
-G:?:G
-I:104:35:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-# Now, the rest of the runes...
-
-N:697:Undeath
-G:?:G
-I:104:92:0
-W:35:5:2:1000
-A:35/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:698:Protection
-G:?:G
-I:104:74:0
-W:45:5:2:1500
-A:45/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
 # XXX
 
 # The Ring of Precognition (now a k_info.txt artifact)
@@ -5533,10 +5589,14 @@ I:45:51:0
 W:90:0:2:300000
 A:90/100
 T:45:23
-F:PRECOGNITION |
-f:PRECOGNITION |
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:PRECOGNITION
+f:PRECOGNITION
 D:This magical ring allows you to know what you will encounter in the near future.
 
 # Athelas, cures Black Breath
@@ -5577,8 +5637,12 @@ I:70:40:0
 W:90:0:5:160000
 A:90/140
 T:70:51
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:It allows you to leave your body to reincarnate into
 D:another one. However, your current body is lost in the process.
 
@@ -5588,7 +5652,8 @@ I:23:33:0
 W:25:0:70:500
 A:25/1:80/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:SHOW_MODS
 f:ANTIMAGIC_50
 D:A strange, very sharp long sword, which seems to drain light from its surroundings. As you
 D:wield it, you feel much less attuned to magic.
@@ -5690,8 +5755,12 @@ W:90:0:4:100000
 A:90/25
 P:0:1d1:0:0:0
 T:71:49
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This old potion is supposed to grant more learning power
 D:to its user.
 
@@ -5730,8 +5799,9 @@ G:=:d
 I:45:54:0
 W:20:0:2:16000
 A:20/3
-F:FLY | EASY_KNOW
-f:FLY |
+F:EASY_KNOW
+F:FLY
+f:FLY
 D:This ring is imbued with the power of eagles. It grants you the power of flight.
 
 N:756:& Tome~ of the Time
@@ -5740,7 +5810,8 @@ I:111:8:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome seems to have trouble deciding whether it really exists now. Its flickering pages
 D:contain all that is known about the currents of time.
 
@@ -5758,7 +5829,10 @@ I:111:9:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:This tome gives you deeper insights on the works of magic.
 
 N:759:& Tome~ of the Mind
@@ -5767,7 +5841,8 @@ I:111:10:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome has no pages; knowledge is transferred to you if you simply
 D:hold it.
 
@@ -5777,7 +5852,8 @@ I:111:20:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This dusty tome is filled with ancient rituals,
 D:designed to uncover all that is hidden.
 
@@ -5787,7 +5863,8 @@ I:111:21:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A large jewel-encrusted tome that transfers
 D:wisdom and understanding to its wearer.
 
@@ -5797,7 +5874,8 @@ I:111:22:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome fills you with glorious visions of total devastation.
 D:Anyone in your way shall be destroyed.
 
@@ -5807,7 +5885,9 @@ I:111:11:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
 D:This singed book smells like burned flesh.  Its power is as evident
 D:as its thirst for your blood.
 
@@ -5817,7 +5897,8 @@ I:111:23:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A black and scarlet flame springs from this tome, issuing
 D:a thunderous roar under which you think you hear the screams of tormented souls.
 
@@ -5827,7 +5908,8 @@ I:111:24:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 
 # for the Library Quest
 # Tome of PLAYER
@@ -5837,8 +5919,15 @@ I:111:61:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI | SPECIAL_GENE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | NORM_ART
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:SPECIAL_GENE
 D:This book has some of your favourite spells inside.
 
 # The Ring of Phasing -- see artifact list
@@ -5848,7 +5937,8 @@ G:=:d
 I:45:55:0
 W:110:0:2:300000
 A:110/5
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 N:771:[Earth]
 G:?:R
@@ -5876,7 +5966,10 @@ I:114:2:0
 W:50:0:30:2500
 A:50/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A completely translucent gem; as you behold it, you hear a great wind and feel like you're
 D:about to take off and fly away.
@@ -5887,7 +5980,10 @@ I:114:3:0
 W:70:0:30:50000
 A:70/3
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A large gem, filled with dark blue water. It feels strangely heavy and cold.
 
@@ -5897,7 +5993,10 @@ I:114:4:0
 W:100:0:30:100000
 A:100/3
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A large gem that seems somehow immaterial and is filled with a strange insubstantial... power?
 
@@ -5910,8 +6009,12 @@ W:90:0:15:150000
 A:100/14
 P:0:1d1:0:0:0
 T:66:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This rod creates a little hatch, allowing access to your home, no matter how far away the abode
 D:is.
 
@@ -5922,7 +6025,9 @@ I:23:32:1
 W:50:900:45:2000
 A:48/4:60/2:80/1
 P:0:4d4:-2:2:0
-F:IGNORE_ACID | RES_DARK | STEALTH
+F:IGNORE_ACID
+F:RES_DARK
+F:STEALTH
 f:STEALTH
 D:A thin long sword made of a completely black metal, which reflects no light.
 
@@ -5932,7 +6037,8 @@ I:23:31:0
 W:60:1800:50:6000
 A:60/20
 P:0:1d6:4:0:0
-F:SHOW_MODS | VORPAL
+F:SHOW_MODS
+F:VORPAL
 D:A small sword made of a blueish metal with a strangely rough surface. As anything is hurt
 D:with it, the weapon will stick inside the wound and cause horrible wounds when torn away.
 
@@ -5943,7 +6049,9 @@ I:40:17:0
 W:25:0:3:10000
 A:25/1
 a:BA_POIS_4
-F:RES_POIS | DEX | ACTIVATE
+F:ACTIVATE
+F:DEX
+F:RES_POIS
 D:A petrified serpent's tongue, hung on a thin chain to be clasped around your neck. It makes you
 D:like unto snakes, able to wriggle out of tight corners, impervious to poisons and poisonous
 D:yourself.
@@ -5956,9 +6064,14 @@ G:=:d
 I:45:5:0
 W:100:0:2:1
 A:100/100
-F:INVIS | DRAIN_EXP | CURSED | HEAVY_CURSE | CURSE_NO_DROP
+F:CURSED
+F:CURSE_NO_DROP
+F:DRAIN_EXP
+F:FULL_NAME
+F:HEAVY_CURSE
+F:INVIS
+F:SPECIAL_GENE
 f:INVIS
-F:SPECIAL_GENE | FULL_NAME
 
 # To help people climb mountains...
 
@@ -5988,7 +6101,9 @@ I:115:55:0
 W:10:0:150:500
 A:10/1
 P:0:4d6:0:0:0
-F:SHOW_MODS | SLAY_DEMON | WIELD_CAST
+F:SHOW_MODS
+F:SLAY_DEMON
+F:WIELD_CAST
 D:This blade has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, helping
 D:you slay other demons.
@@ -5999,7 +6114,8 @@ I:115:56:0
 W:15:0:70:500
 A:15/1
 P:5:1d1:0:0:0
-F:REGEN | WIELD_CAST
+F:REGEN
+F:WIELD_CAST
 D:This shield has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, giving
 D:life to any that wield it.
@@ -6010,7 +6126,8 @@ I:115:57:0
 W:20:0:30:500
 A:20/1
 P:2:1d1:0:0:0
-F:LITE2 | WIELD_CAST
+F:LITE2
+F:WIELD_CAST
 D:This horn is about six feet long.  Just looking at it makes you nervous.
 
 # XXX
@@ -6094,7 +6211,8 @@ I:80:41:0
 W:90:5:2:60000
 A:90/50
 T:80:40
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:This food will, once eaten, permanently add 70 HP.
 
 # Scroll of Mass Resurrection - artifact scroll
@@ -6104,8 +6222,12 @@ I:70:43:0
 W:55:0:5:0
 A:55/1
 T:70:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This magical scroll sends a call to the halls of Mandos, issuing forth all those who have been
 D:slain by the reader.
 
@@ -6135,20 +6257,11 @@ I:24:30:0
 W:70:0:300:6000
 A:70/8
 P:0:5d7:0:0:0
-F:SLAY_ANIMAL | SHOW_MODS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A huge axe, the sort used for slaughtering animals, this weapon is unusually deadly against
 D:natural creatures.
 
-N:806:& Runestone~
-G:?:v
-I:105:255:0
-W:10:5:2:300
-A:10/3:20/2:30/1:60/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
-D:A small oval stone. One surface is flat, as if something ought to be scratched or inscribed into
-D:it.
-
 N:807:& Fortune cookie~
 G:,:U
 I:80:42:500
@@ -6175,7 +6288,12 @@ W:10:10:10:3200
 A:10/200
 P:0:10d10:0:0:0
 T:65:6
-F:RECHARGE | SPECIAL_GENE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:The miner's friend.  This wand was used by Thrain to dig into the
 D:walls of the dungeon.  Its indestructible nature makes it quite useful.
 
@@ -6187,7 +6305,11 @@ W:50:10:10:12000
 P:0:10d4:0:0:0
 A:50/200
 T:55:8
-F:RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
 D:Mithrandir's staff that throws powerful fire attacks at all enemies.  It
 D:can be recharged without blowing up, for it is built to hold
 D:much magical energy.
@@ -6221,7 +6343,11 @@ I:11:7:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Eru. The relic now lies in pieces, hidden
 D:from all but but his most dedicated followers.
@@ -6232,7 +6358,11 @@ I:11:8:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Manwe. The relic now lies in pieces, hidden
 D:from all but his most dedicated followers.
@@ -6243,7 +6373,11 @@ I:11:9:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to worshippers of Tulkas. The relic now lies in pieces,
 D:hidden from all but his most dedicated followers.
@@ -6254,7 +6388,11 @@ I:11:10:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Dark Priests. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Melkor.
@@ -6265,7 +6403,11 @@ I:11:11:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Druids. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Yavanna.
diff --git a/lib/edit/maeglin.map b/lib/edit/maeglin.map
index e3be9972..7916fd9b 100644
--- a/lib/edit/maeglin.map
+++ b/lib/edit/maeglin.map
@@ -11,7 +11,7 @@ F:X:63:3
 F:<:172:3
 
 # up stairs with maeglin
-F:{:6:3:825:0:0:0:0:0:0:2
+F:{:6:3:825:0:0:0:0:0:2
 
 # Floor with dirt
 F:.:88:5
@@ -56,7 +56,7 @@ F:R:88:5:644
 F:O:88:5:645
 
 # Floor with dirt with a Lesser Balrog
-F:U:88:5:996:0:0:0:0:0:0:2
+F:U:88:5:996:0:0:0:0:0:2
 
 # Granite wall
 F:#:56:5
diff --git a/lib/edit/misc.txt b/lib/edit/misc.txt
index b2471a06..06a9fcce 100644
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -12,77 +12,8 @@ M:X:101
 # Maximum y size of the wilderness
 M:Y:66
 
-# Maximum number of randart parts in ra_info.txt
-M:Z:516
-
-# Maximum number of monsters in r_info.txt
-# WARNING ! add one more to the real count for the player ghost !!
-M:R:1078
-
-# Maximum number of monsters in re_info.txt
-# WARNING ! Use the exact amount of ego types used, if not you
-# will get weird results !
-M:r:14
-
-# Maximum number of items in k_info.txt
-M:K:819
-
-# Maximum number of vaults in v_info.txt
-M:V:108
-
-# Maximum number of terrain features in f_info.txt
-M:F:256
-
-# Maximum number of artifacts in a_info.txt
-M:A:219
-
-# Maximum number of sets types in set_info.txt
-M:s:10
-
-# Maximum number of ego-items in e_info.txt
-M:E:200
-
-# Maximum number of dungeon types in d_info.txt
-M:D:31
-
-# Maximum number of trap types in tr_info.txt
-M:U:176
-
-# Maximum number of terrain types in wf_info.txt
-M:W:30
-
-# Maximum number of owners types in ow_info.txt
-M:N:70
-
-# Maximum number of building actions in ba_info.txt
-M:B:62
-
-# Maximum number of store types in st_info.txt
-M:S:61
-
 # Maximum size for "o_list[]"
 M:O:1024
 
 # Maximum size for "m_list[]"
 M:M:768
-
-# Maximum number of race types in p_info.txt
-M:P:R:22
-
-# Maximum number of subrace types in p_info.txt
-M:P:S:10
-
-# Maximum number of class types in p_info.txt
-M:P:C:32
-
-# Maximum number of meta class types in p_info.txt
-M:P:M:1
-
-# Maximum number of histories types in p_info.txt
-M:P:H:266
-
-# Maximum number of skills in s_info.txt
-M:k:60
-
-# Maximum number of traits in ab_info.txt
-M:b:50
diff --git a/lib/edit/nirnaeth.map b/lib/edit/nirnaeth.map
index a8c06999..3ad0789c 100644
--- a/lib/edit/nirnaeth.map
+++ b/lib/edit/nirnaeth.map
@@ -14,28 +14,28 @@ F:s:88:5
 F:V:84:5
 
 # Dirt with Olog
-F:a:88:5:538:0:0:0:0:0:0:2
+F:a:88:5:538:0:0:0:0:0:2
 
 # Dirt with Cave Troll
-F:b:88:5:496:0:0:0:0:0:0:2
+F:b:88:5:496:0:0:0:0:0:2
 
 # Dirt with with Eldrak
-F:c:88:1:620:0:0:0:0:0:0:2
+F:c:88:1:620:0:0:0:0:0:2
 
 # Dirt with with Ettin
-F:e:88:1:621:0:0:0:0:0:0:2
+F:e:88:1:621:0:0:0:0:0:2
 
 # Dirt with with War troll
-F:f:88:1:631:0:0:0:0:0:0:2
+F:f:88:1:631:0:0:0:0:0:2
 
 # Dirt with with Hru
-F:g:88:1:709:0:0:0:0:0:0:2
+F:g:88:1:709:0:0:0:0:0:2
 
 # Dirt with Ulik the Troll
-F:h:88:5:729:0:0:0:0:0:0:2
+F:h:88:5:729:0:0:0:0:0:2
 
 # Dirt with Ancient green dragon
-F:i:88:5:618:0:0:0:0:0:0:2
+F:i:88:5:618:0:0:0:0:0:2
 
 # Dungeon
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/numenor.txt b/lib/edit/numenor.txt
index ec8621b1..0ca52738 100644
--- a/lib/edit/numenor.txt
+++ b/lib/edit/numenor.txt
@@ -1,7 +1,7 @@
 # File: numenor.txt
 
 # Way to the lost land of Numenor
-F:>:7:3:0:0:0:0:0:7
+F:>:7:3:0:0:0:0:7
 
 ############### Town Layout ###############
 
diff --git a/lib/edit/ow_info.txt b/lib/edit/ow_info.txt
index d71dfa26..7a27fc59 100644
--- a/lib/edit/ow_info.txt
+++ b/lib/edit/ow_info.txt
@@ -16,77 +16,156 @@
 N:0:Bilbo the Friendly(Hobbit)
 I:20000:120
 C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:1:Uldrik(Human)
 I:20000:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:2:Otick(Human)
 I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:3:Merana(Human)
 I:0:120
 C:200:100:95
 L:Human
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:4:Mirimbar(High-Elf)
 I:0:120
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:5:Raistlin the Chicken(Human)
 I:20000:130
 C:120:100:80
 L:Human
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:6:Sultan the Midget(Gnome)
 I:30000:120
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:7:Lyar-el the Comely(Elf)
 I:30000:120
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:8:Kon-Dar the Ugly(Half-Orc)
 I:5000:140
 C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:9:Darg-Low the Grim(Human)
 I:10000:130
 C:120:100:80
 L:Human
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:10:Decado the Handsome(Dunadan)
 I:25000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:11:Wieland the Smith(Dwarf)
 I:30000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:12:Arnold the Beastly(Barbarian)
 I:5000:140
@@ -95,26 +174,55 @@ C:120:100:80
 N:13:Arndal Beast-Slayer(Half-Elf)
 I:10000:130
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:14:Eddie Beast-Master(Half-Orc)
 I:25000:140
 C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:15:Oglign Dragon-Slayer(Dwarf)
 I:30000:130
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:16:Aragorn(Dunadan)
 I:20000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:17:Sondar(Human)
 I:0:140
@@ -123,15 +231,28 @@ C:120:100:80
 N:18:Celebor(Half-Elf)
 I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:19:Sharra(Human)
 I:25000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:20:Hjolgar(Barbarian)
 I:5000:140
@@ -169,266 +290,523 @@ L:Thunderlord
 N:26:Ludwig the Humble(Dwarf)
 I:5000:130
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:27:Gunnar the Paladin(Half-Troll)
 I:10000:130
 C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:28:Torin the Chosen(High-Elf)
 I:25000:130
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:29:Sarastro the Wise(Human)
 I:30000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:30:Mauser the Chemist(Half-Elf)
 I:10000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:31:Wizzle the Chaotic(Hobbit)
 I:10000:130
 C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:32:Midas the Greedy(Gnome)
 I:15000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:33:Ja-Far the Alchemist(Elf)
 I:15000:140
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:34:Ariel the Sorceress(Half-Elf)
 I:20000:140
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:35:Buggerby the Great(Gnome)
 I:20000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:36:Inglorian the Mage(Human)
 I:30000:140
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:37:Luthien Starshine(High-Elf)
 I:30000:130
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:38:Gary Gygaz(Half-Troll)
 I:20000:180
 C:120:100:80
 #L:Rogue
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:39:Histor the Goblin(Half-Orc)
 I:20000:180
 C:120:100:80
 #L:Rogue
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:40:Zorak the Smart(Dwarf)
 I:30000:180
 C:120:100:80
 #L:Rogue
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:41:Tipo the Fair(Human)
 I:30000:180
 C:120:100:80
 #L:Rogue
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:42:Dolaf the Greedy(Human)
 I:10000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:43:Odnar the Sage(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:44:Gandar the Neutral(Dark-Elf)
 I:25000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:45:Ro-sha the Patient(Elf)
 I:30000:110
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:46:N'rak the Summoner(Human)
 I:10000:130
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:47:Esperion the Beastlover(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:48:Flarim the Shopkeeper(Dunadan)
 I:25000:110
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:49:Tril-akheb the Supreme(Elf)
 I:30000:110
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:50:Dorchel(Elf)
 I:30000:110
 C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:51:Galadriel(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:52:Celeborn(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:53:Aulendil(Elf)
 I:30000:110
 C:120:100:80
 #L:Warrior |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:54:Valceronwe(Elf)
 I:30000:110
 C:120:100:80
 #L:Mage | Thaumaturgist | Sorceror
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:55:Voronwe(Elf)
 I:30000:110
 C:120:100:80
 #L:Priest | Paladin
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:56:Celegail(Elf)
 I:30000:110
 C:120:100:80
 #L:Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:57:Turgon(High-Elf)
 I:30000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:58:Pengolodh(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:59:Aerandir(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:60:Celebrimbor(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Warrior |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:61:Lomelosse(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:62:Arlindel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Harper | Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:63:Sulraen(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Mage | Sorceror
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:64:Firiel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:65:Earendur(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:66:Glorfindel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:67:Ecthelion(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Paladin
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:68:Kanris(Human)
 I:5000:140
@@ -437,5 +815,12 @@ C:120:100:80
 N:69:Barliman Butterbur(Human)
 I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
diff --git a/lib/edit/p_info.txt b/lib/edit/p_info.txt
index c02e765a..5cb2e5cd 100644
--- a/lib/edit/p_info.txt
+++ b/lib/edit/p_info.txt
@@ -29,7 +29,6 @@ G:k:+1000:+1000:Magic-Device
 # C:D:1:titles
 # C:S:str:int:wis:dex:con:chr:mana:bonus blows
 # C:K:dis:dev:sav:stl:srh:fos:thn:thb
-# C:X:dis:dev:sav:stl:srh:fos:thn:thb
 # C:P:hitdie:xp%
 # C:B:num:wgt:mul
 # C:C:(H|L):(H|L):base:pl:plus
@@ -52,7 +51,7 @@ G:k:+1000:+1000:Magic-Device
 # C:a:b:level:ability
 # C:a:O:tval:sval:xdy
 
-C:N:0:Warrior
+C:N:0:0:Warrior
 C:D:0:Simple fighters, they hack away with their trusty weapon.
 C:D:1:Rookie
 C:D:1:Soldier
@@ -65,10 +64,7 @@ C:D:1:Baron
 C:D:1:Duke
 C:D:1:Lord
 C:S:5:-2:-2:2:2:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:5
-C:C:H:L:9000:2:40
 C:P:9:0
 C:R:30:0
 C:F:RES_FEAR
@@ -82,9 +78,7 @@ C:k:+0:+400:Axe-mastery
 C:k:+0:+400:Hafted-mastery
 C:k:+0:+400:Polearm-mastery
 C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
 C:k:+1000:+300:Magic
 C:k:+1000:+400:Spirituality
 C:k:+0:+550:Antimagic
@@ -173,8 +167,6 @@ C:a:k:=0:=0:Axe-mastery
 C:a:k:=0:=0:Hafted-mastery
 C:a:k:=0:=0:Polearm-mastery
 C:a:k:+1000:-200:Archery
-C:a:k:+1000:+900:Sneakiness
-C:a:k:+1000:+900:Disarming
 C:a:k:+1000:+400:Magic
 C:a:k:+1000:+300:Spirituality
 C:a:k:=0:=0:Antimagic
@@ -184,7 +176,7 @@ C:a:g:Manwe Sulimo
 C:a:g:Tulkas
 C:a:g:Melkor Bauglir
 
-C:N:1:Mage
+C:N:1:3:Mage
 C:D:0:The basic spellcaster with lots of different skills
 C:D:1:Apprentice
 C:D:1:Trickster
@@ -197,10 +189,7 @@ C:D:1:Sorcerer
 C:D:1:Ipsissimus
 C:D:1:Archimage
 C:S:-5:3:0:1:-2:1:50:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:40:2
-C:C:L:H:240000:1:5
 C:P:0:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
@@ -218,12 +207,10 @@ C:k:+0:+700:Nature
 C:k:+0:+700:Meta
 C:k:+0:+700:Mind
 C:k:+0:+700:Necromancy
-C:k:+0:+700:Runecraft
 C:k:+0:+700:Thaumaturgy
 C:k:+1000:+550:Spirituality
 C:k:+1000:+200:Combat
 C:k:+700:+500:Weaponmastery
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
 C:b:1:Perfect casting
 C:g:All Gods
@@ -296,7 +283,6 @@ C:a:k:+0:+300:Divination
 C:a:k:+0:+300:Meta
 C:a:k:+0:+300:Mind
 C:a:k:+0:+200:Necromancy
-C:a:k:+0:+200:Runecraft
 C:a:k:+0:+200:Thaumaturgy
 C:a:O:36:2:1d1
 C:a:O:111:50:1d1
@@ -318,17 +304,6 @@ C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 C:a:b:25:Undead Form
 
-C:a:N:Runecrafter
-C:a:D:Runecrafters use the runes found in Middle-earth to create
-C:a:D:finely tuned spells for each specific situation.
-C:a:k:+1000:+50:Magic
-C:a:k:+1000:+300:Runecraft
-C:a:k:+0:-100:Weaponmastery
-C:a:O:111:50:1d1
-C:a:O:105:1:1d1
-C:a:O:104:5:1d1
-C:a:O:23:4:1d1
-
 C:a:N:Thaumaturgist
 C:a:D:Thaumaturgy spells come from within and are different for each character.
 C:a:D:Since attack is the best defence, all their spells are offensive.
@@ -340,7 +315,7 @@ C:a:k:+0:-150:Magic-Device
 C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 
-C:N:2:Archer
+C:N:2:1:Archer
 C:D:0:'Kill them before they see you' could be the motto of the archer class.
 C:D:0:As deadly with a bow as a warrior is with a sword.
 C:D:1:Rock Thrower
@@ -354,10 +329,7 @@ C:D:1:Archer
 C:D:1:Archer
 C:D:1:Great Archer
 C:S:2:1:0:2:1:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:4
-C:C:H:L:9000:2:40
 C:P:4:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+800:Combat
@@ -368,9 +340,7 @@ C:k:+0:+300:Crossbow-mastery
 C:k:+0:+300:Sling-mastery
 C:k:+0:+300:Boomerang-mastery
 C:k:+0:%150:Boulder-throwing
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
 C:k:+1000:+300:Magic
 C:k:+0:+100:Magic-Device
 C:k:+1000:+400:Spirituality
@@ -398,8 +368,6 @@ C:a:k:+0:+400:Magic
 C:a:k:+0:+500:Nature
 C:a:k:+0:+500:Divination
 C:a:k:+0:+500:Conveyance
-C:a:k:+0:+700:Disarming
-C:a:k:+0:+50:Sneakiness
 C:a:k:+0:+200:Monster-lore
 C:a:O:19:12:1d1
 C:a:O:17:1:10d3
@@ -409,9 +377,9 @@ C:a:g:Manwe Sulimo
 C:a:g:Tulkas
 C:a:g:Yavanna Kementari
 
-C:N:3:Rogue
+C:N:3:2:Rogue
 C:D:0:Rogues are masters of tricks. They can steal from shops and monsters,
-C:D:0:and lure monsters into deadly monster traps.
+C:D:0:and excel at stealthily exploring the dungeon.
 C:D:1:Cutpurse
 C:D:1:Robber
 C:D:1:Burglar
@@ -423,10 +391,7 @@ C:D:1:Master Thief
 C:D:1:Assassin
 C:D:1:Guildmaster
 C:S:2:1:-2:3:1:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:H:20000:2:40
 C:P:6:25
 C:O:23:4:1d1
 C:G:EASE_STEAL
@@ -473,9 +438,7 @@ C:k:+0:+500:Conveyance
 C:k:+0:+500:Divination
 C:k:+0:+500:Temporal
 C:k:+1000:+700:Spirituality
-C:k:+1000:+2000:Sneakiness
 C:k:+1000:+1500:Stealth
-C:k:+1000:+2000:Disarming
 C:k:+1000:+1000:Backstab
 C:k:+1000:+2000:Stealing
 C:k:+1000:+2000:Dodging
@@ -485,8 +448,6 @@ C:b:10:Extra Max Blow(1)
 C:a:N:Rogue
 C:a:D:Rogues are masters of tricks. They can steal from shops and monsters,
 C:a:D:and lure monsters into deadly monster traps.
-C:a:b:1:Trapping
-C:a:O:46:1:1d1
 
 C:a:N:Assassin
 C:a:D:Assassins are stealthy killers.
@@ -500,12 +461,11 @@ C:a:k:+0:-400:Conveyance
 C:a:k:+0:-400:Divination
 C:a:k:+0:-300:Temporal
 C:a:k:+0:+500:Stealth
-C:a:k:+0:-1000:Disarming
 C:a:k:+0:+1000:Backstab
 C:a:k:+0:-1800:Stealing
 C:a:k:+0:-800:Magic-Device
 
-C:N:4:Loremaster
+C:N:4:5:Loremaster
 C:D:0:Loremasters are skilled in most combat and monster skills.
 C:D:1:Apprentice
 C:D:1:Apprentice
@@ -518,10 +478,7 @@ C:D:1:Lorekeeper
 C:D:1:Loremaster
 C:D:1:Loremaster
 C:S:1:-2:1:1:0:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:L:9000:2:40
 C:P:8:40
 C:E:0:0:0:0:0:0
 C:k:+1000:+700:Combat
@@ -529,9 +486,7 @@ C:k:+1000:+700:Weaponmastery
 C:k:+1000:+700:Archery
 C:k:+1000:+700:Barehand-combat
 C:k:+0:+600:Magic
-C:k:+1000:+700:Sneakiness
 C:k:+1000:+700:Stealth
-C:k:+1000:+700:Disarming
 C:k:+1000:+700:Spirituality
 C:k:+1000:+600:Monster-lore
 C:k:+0:+500:Possession
@@ -560,7 +515,6 @@ C:a:k:+0:-100:Combat
 C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-300:Archery
 C:a:k:-1000:-700:Barehand-combat
-C:a:k:+0:-200:Disarming
 C:a:k:+0:-200:Spirituality
 C:a:k:+1000:+300:Possession
 C:a:k:+0:+200:Corpse-preservation
@@ -578,7 +532,6 @@ C:a:k:+0:+100:Combat
 C:a:k:+0:+100:Weaponmastery
 C:a:k:+0:-100:Barehand-combat
 C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
 C:a:k:+0:+100:Stealth
 C:a:k:+0:-200:Spirituality
 C:a:k:+0:-400:Possession
@@ -596,7 +549,6 @@ C:a:k:+0:+100:Combat
 C:a:k:+0:+100:Weaponmastery
 C:a:k:+0:-100:Barehand-combat
 C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
 C:a:k:+0:+100:Stealth
 C:a:k:+0:-200:Spirituality
 C:a:k:+0:-400:Possession
@@ -615,9 +567,7 @@ C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-300:Archery
 C:a:k:-1000:-700:Barehand-combat
 C:a:k:+1000:+200:Magic
-C:a:k:+0:+0:Sneakiness
 C:a:k:+0:+0:Stealth
-C:a:k:+0:-200:Disarming
 C:a:k:+0:-200:Spirituality
 C:a:k:+15000:+100:Monster-lore
 C:a:k:+0:-500:Possession
@@ -636,9 +586,7 @@ C:a:k:-1000:-400:Weaponmastery
 C:a:k:-1000:-300:Archery
 C:a:k:+0:+200:Barehand-combat
 C:a:k:+0:+0:Magic
-C:a:k:+0:+200:Sneakiness
 C:a:k:+0:+200:Stealth
-C:a:k:+0:+200:Disarming
 C:a:k:+0:+200:Spirituality
 C:a:k:+0:-400:Possession
 C:a:k:+0:-200:Corpse-preservation
@@ -660,7 +608,6 @@ C:a:O:14:59:1d1
 C:a:k:+1000:+0:Magic
 C:a:k:-1000:-700:Archery
 C:a:k:+0:-100:Barehand-combat
-C:a:k:+0:-100:Disarming
 C:a:k:+0:+100:Spirituality
 C:a:k:+0:-500:Possession
 C:a:k:+0:-100:Summoning
@@ -668,7 +615,7 @@ C:a:k:+0:-100:Symbiosis
 C:a:k:+0:-100:Mimicry
 C:a:k:+1000:+500:Music
 
-C:N:5:Priest
+C:N:5:4:Priest
 C:D:0:A priest serves a god (Vala, Maia or Eru himself) to bring down
 C:D:0:the empire of fear and shadows of Morgoth.
 C:D:1:Believer
@@ -682,13 +629,10 @@ C:D:1:Cardinal
 C:D:1:Inquisitor
 C:D:1:Pope
 C:S:-1:-3:3:-1:0:2:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:3
-C:C:L:H:10000:2:40
 C:P:2:20
 C:Z:detect curses
-C:G:GOD_FRIEND |
+C:G:GOD_FRIEND
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
 C:k:+0:+600:Spell-power
@@ -698,8 +642,6 @@ C:k:+1000:+1000:Spirituality
 C:k:+1000:+700:Prayer
 C:k:+2000:+700:Combat
 C:k:+1000:+700:Weaponmastery
-C:k:+1000:+900:Sneakiness
-C:k:+0000:+900:Disarming
 C:k:+0000:+400:Stealth
 C:k:+0:+50:Magic-Device
 C:b:1:Perfect casting
@@ -767,50 +709,8 @@ C:a:g:Yavanna Kementari
 C:a:k:+0:-300:Prayer
 C:a:k:+0:-200:Necromancy
 C:a:k:+1000:+300:Mindcraft
-C:a:k:+0:+200:Sneakiness
 C:a:k:+0:+100:Magic-Device
 
-###############################TEST###############################
-C:N:30:Test
-C:D:0:Simple testers.
-C:D:1:Rookie
-C:D:1:Soldier
-C:D:1:Mercenary
-C:D:1:Veteran
-C:D:1:Swordsman
-C:D:1:Champion
-C:D:1:Hero
-C:D:1:Baron
-C:D:1:Duke
-C:D:1:Lord
-C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
-C:B:6:30:5
-C:C:H:L:9000:2:40
-C:P:9:0
-C:R:30:0
-C:F:RES_FEAR
-C:E:0:0:0:0:0:0
-C:O:45:38:1d1
-C:O:37:4:1d1
-C:k:+1000:+800:Combat
-C:k:+1000:+850:Weaponmastery
-C:k:+0:+200:Sword-mastery
-C:k:+0:+200:Axe-mastery
-C:k:+0:+200:Hafted-mastery
-C:k:+0:+200:Polearm-mastery
-C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
-C:k:+1000:+900:Disarming
-C:k:+1000:+300:Magic
-C:k:+0:+550:Antimagic
-
-C:a:N:Shinny test
-C:a:D:Simple testers, they test all with their shiny hacks !
-C:a:O:23:16:1d1
-###############################TEST###############################
-
 
 
 
@@ -825,8 +725,7 @@ C:a:O:23:16:1d1
 # R:D:race desc
 # R:S:str:int:wis:dex:con:chr:luck
 # R:K:dis:dev:sav:stl:srh:fos:thn:thb
-# R:P:hitdie:xp%:infra:history chart
-# R:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
+# R:P:hitdie:xp%:infra
 # R:E:weapons:torso:arms:finger:head:legs
 # R:C:allowed classes
 # R:G:race flags
@@ -842,26 +741,30 @@ R:D:Humans are the second born, the Edain.
 R:D:They are the basic race to which all others are compared.
 R:D:Average in ability, they can be any class.
 R:S:0:0:0:0:0:0:0
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:1
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 
 R:N:1:Half-Elf
 R:D:A crossbreed of elf and human, they get the best of the two races.
 R:S:0:1:1:1:-1:1:0
-R:K:2:3:3:1:6:11:-1:5
-R:P:9:110:2:4
-R:M:24:16:66:6:130:15:62:6:100:10
+R:P:9:110:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:ELF
-R:k:+200:+000:Disarming
 R:k:+300:+000:Magic-Device
 R:k:+1500:+000:Spirituality
 R:k:+1000:+000:Stealth
-R:k:+600:+000:Sneakiness
 R:k:-100:+000:Weaponmastery
 R:k:+500:+000:Archery
 
@@ -870,19 +773,19 @@ R:D:Elves are the first born, the Eldar.
 R:D:More spiritual than physical beings, they are weaker than humans
 R:D:but are more intelligent.
 R:S:-1:2:2:1:-2:2:0
-R:K:5:6:6:2:8:12:-5:15
-R:P:8:120:3:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:8:120:3
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster
+R:F:RES_LITE
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 R:G:ELF
-R:k:+500:+000:Disarming
 R:k:+600:+000:Magic-Device
 R:k:+3000:+000:Spirituality
 R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:+1500:+000:Archery
 
@@ -890,21 +793,22 @@ R:N:3:Hobbit
 R:D:An old but quiet race related to humans.
 R:D:They are small and quite weak but good at many things.
 R:S:-2:2:1:3:2:1:5
-R:K:15:18:18:5:12:15:-10:20
-R:P:7:110:4:10
-R:M:21:12:36:3:60:3:33:3:50:3
+R:P:7:110:4
 R:E:1:1:1:2:1:1
 R:Z:create food
-R:G:RESIST_BLACK_BREATH | XTRA_MIGHT_SLING |
+R:G:RESIST_BLACK_BREATH
+R:G:XTRA_MIGHT_SLING
 R:R:1:0
-R:F:SUST_DEX | 
-R:C:Warrior | Archer | Mage | Rogue | Loremaster
+R:F:SUST_DEX
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Rogue
+R:C:Warrior
 R:k:+0:+300:Sling-mastery
-R:k:+1500:+000:Disarming
 R:k:+1800:+000:Magic-Device
 R:k:+9000:+000:Spirituality
 R:k:+5000:+000:Stealth
-R:k:+1200:+000:Sneakiness
 R:k:-1000:+000:Weaponmastery
 R:k:+2000:+000:Archery
 
@@ -912,19 +816,17 @@ R:N:4:Gnome
 R:D:Related to dwarves, Gnomes are between Dwarves and Hobbits in size.
 R:D:Very good at magic use, they are poor as fighters.
 R:S:-1:2:0:2:1:-2:2
-R:K:10:12:12:3:6:13:-8:12
-R:P:8:135:4:13
-R:M:50:40:42:3:90:6:39:3:75:3
+R:P:8:135:4
 R:E:1:1:1:2:1:1
 R:Z:blink
 R:R:1:0
-R:F:FREE_ACT | 
-R:C:Warrior | Mage | Rogue
-R:k:+1000:+000:Disarming
+R:F:FREE_ACT
+R:C:Mage
+R:C:Rogue
+R:C:Warrior
 R:k:+1200:+000:Magic-Device
 R:k:+6000:+000:Spirituality
 R:k:+3000:+000:Stealth
-R:k:+600:+000:Sneakiness
 R:k:-800:+000:Weaponmastery
 R:k:+1200:+000:Archery
 
@@ -932,39 +834,35 @@ R:N:5:Dwarf
 R:D:The children of Aule, a strong but small race.
 R:D:Miners and fighters of legend.
 R:S:2:-2:2:-2:2:-3:0
-R:K:2:9:10:-1:7:10:15:0
-R:P:11:125:5:16
-R:M:35:15:48:3:150:10:46:3:120:10
+R:P:11:125:5
 R:E:1:1:1:2:1:1
 R:Z:find secret passages
 R:R:1:0
-R:F:RES_BLIND | 
-R:C:Warrior | Priest
+R:F:RES_BLIND
+R:C:Priest
+R:C:Warrior
 R:k:+0:+200:Axe-mastery
-R:k:+200:+000:Disarming
 R:k:+900:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:-1000:+000:Stealth
-R:k:+700:+000:Sneakiness
 R:k:+1500:+000:Weaponmastery
 R:k:+500:+000:Archery
 
 R:N:6:Orc
 R:D:Quite strong but not very smart.
 R:S:2:-1:0:1:1:-4:-3
-R:K:-3:-3:-3:-1:0:7:12:-5
-R:P:10:110:3:25
-R:M:11:4:66:1:150:5:62:1:120:5
+R:P:10:110:3
 R:E:1:1:1:2:1:1
 R:Z:remove fear
 R:R:1:0
-R:F:RES_DARK | 
-R:C:Warrior | Archer | Rogue | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:C:Archer
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:-300:+000:Magic-Device
 R:k:-1000:+000:Spirituality
 R:k:-1000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+1200:+000:Weaponmastery
 R:k:-500:+000:Archery
 
@@ -972,21 +870,17 @@ R:N:7:Troll
 R:D:They can bear the light of the sun.
 R:D:They are extremely strong and dumb.
 R:S:4:-4:-2:-4:3:-6:-4
-R:K:-5:-8:-8:-2:-1:5:20:-10
-R:P:12:137:3:22
-R:M:20:10:96:10:250:50:84:8:225:40
+R:P:12:137:3
 R:E:1:1:1:2:1:1
 R:Z:berserk
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:15:0
-R:F:REGEN | 
+R:F:REGEN
 R:C:Warrior
-R:k:-500:+000:Disarming
 R:k:-800:+000:Magic-Device
 R:k:-4000:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2000:+000:Weaponmastery
 R:k:-1000:+000:Archery
 
@@ -994,18 +888,20 @@ R:N:8:Dunadan
 R:D:The greatest of the Edain, humans in all respects but
 R:D:stronger, smarter and wiser.
 R:S:1:2:2:2:3:2:2
-R:K:4:5:5:2:3:13:15:10
-R:P:10:180:0:1
-R:M:50:50:82:5:190:20:78:6:180:15
+R:P:10:180:0
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SUST_CON | REGEN | 
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
-R:k:+400:+000:Disarming
+R:F:REGEN
+R:F:SUST_CON
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+2500:+000:Spirituality
 R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:+1500:+000:Weaponmastery
 R:k:+1000:+000:Archery
 
@@ -1014,20 +910,20 @@ R:D:Elves are the first born, the Eldar.
 R:D:High elves are the best of the Eldar, strong, fast, intellectual, though
 R:D:they sometimes lack wisdom.
 R:S:1:3:2:3:1:5:0
-R:K:4:20:20:4:3:14:10:25
-R:P:10:200:4:7
-R:M:100:30:90:10:190:20:82:10:180:15
+R:P:10:200:4
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SEE_INVIS | 
-R:F:RES_LITE | 
+R:F:RES_LITE
+R:F:SEE_INVIS
 R:G:ELF
-R:C:Warrior | Archer | Mage | Priest | Loremaster
-R:k:+400:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 R:k:+2000:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:+4000:+000:Stealth
-R:k:+300:+000:Sneakiness
 R:k:+1000:+000:Weaponmastery
 R:k:+2500:+000:Archery
 
@@ -1035,19 +931,17 @@ R:N:10:Half-Ogre
 R:D:A crossbreed between a human and an ogre.
 R:D:They are similar to half-trolls, strong and dumb.
 R:S:3:-1:-1:-1:3:-3:-2
-R:K:-3:-5:-5:-2:-1:5:20:0
-R:P:12:130:3:74
-R:M:40:10:92:10:255:60:80:8:235:60
+R:P:12:130:3
 R:E:1:1:1:2:1:1
 R:Z:set explosive rune
 R:R:1:0
-R:F:SUST_STR | RES_DARK | 
-R:C:Warrior | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:F:SUST_STR
+R:C:Priest
+R:C:Warrior
 R:k:-500:+000:Magic-Device
 R:k:-2500:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1055,41 +949,37 @@ R:N:11:Beorning
 R:D:A race of men shapeshifters.
 R:D:They have the unique power of being able to polymorph to bear forms.
 R:S:4:-2:-2:-1:3:-5:1
-R:K:-6:-8:-6:-2:-1:5:25:5
-R:P:12:150:3:75
-R:M:40:10:100:10:255:65:80:10:240:64
+R:P:12:150:3
 R:E:1:1:1:2:1:1
 R:Z:turn into a bear
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:20:1
-R:F:STR | 
-R:C:Warrior | Rogue | Loremaster
+R:F:STR
+R:C:Loremaster
+R:C:Rogue
+R:C:Warrior
 R:k:+1000:+1000:Bearform-combat
-R:k:-600:+000:Disarming
 R:k:-800:+000:Magic-Device
 R:k:-3000:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2500:+000:Weaponmastery
 R:k:+500:+000:Archery
 
 R:N:12:Kobold
 R:D:A weaker kind of goblin, related to orcs.
 R:S:1:-1:0:1:0:-4:0
-R:K:-2:-3:-2:-1:1:8:10:-8
-R:P:9:125:3:82
-R:M:11:3:60:1:130:5:55:1:100:5
+R:P:9:125:3
 R:E:1:1:1:2:1:1
 R:Z:poison dart
 R:R:1:0
-R:F:RES_POIS | 
-R:C:Warrior | Archer | Rogue
-R:k:-200:+000:Disarming
+R:F:RES_POIS
+R:C:Archer
+R:C:Rogue
+R:C:Warrior
 R:k:-300:+000:Magic-Device
 R:k:-1000:+000:Spirituality
 R:k:-1000:+000:Stealth
-R:k:+100:+000:Sneakiness
 R:k:+1000:+000:Weaponmastery
 R:k:-800:+000:Archery
 
@@ -1097,19 +987,17 @@ R:N:13:Petty-Dwarf
 R:D:A nearly extinct subrace of dwarves.
 R:D:They prefer to live in the darkness.
 R:S:1:-1:2:0:2:-4:-5
-R:K:3:5:10:1:5:10:9:0
-R:P:11:135:5:87
-R:M:40:12:43:3:92:6:40:3:78:3
+R:P:11:135:5
 R:E:1:1:1:2:1:1
 R:Z:detect doors and traps
 R:R:1:0
-R:F:RES_DARK | RES_DISEN | 
-R:C:Warrior | Rogue
-R:k:+300:+000:Disarming
+R:F:RES_DARK
+R:F:RES_DISEN
+R:C:Rogue
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:+1000:+000:Stealth
-R:k:+500:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1118,23 +1006,23 @@ R:D:Elves are the first born, the Eldar.
 R:D:Dark elves are rare on Middle-earth and even though not evil
 R:D:they are not good.
 R:S:-1:3:2:2:-2:1:-2
-R:K:5:15:20:3:8:12:-5:10
-R:P:9:150:5:69
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:9:150:5
 R:E:1:1:1:2:1:1
 R:Z:magic missile
 R:R:1:0
-R:F:RES_DARK | 
+R:F:RES_DARK
 R:R:20:0
-R:F:SEE_INVIS | 
-R:C:Warrior | Archer | Mage | Rogue | Priest
+R:F:SEE_INVIS
+R:C:Archer
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:ELF
 R:k:+0:+200:Magic
-R:k:+500:+000:Disarming
 R:k:+1500:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:+3000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:+1000:+000:Archery
 
@@ -1142,30 +1030,32 @@ R:N:15:Ent
 R:D:Guardian of the forests of Middle-earth, summoned by Yavanna before
 R:D:even the elves awoke. It is said 'Trolls are strong, Ents are STRONGER'.
 R:S:10:-3:2:-5:11:-3:-2
-R:K:5:5:20:-6:5:4:15:5
-R:P:14:210:5:95
-R:M:255:70:72:6:100:25:66:4:100:20
+R:P:14:210:5
 R:E:1:1:1:2:1:1
 R:Z:grow trees
-R:G:NO_STUN | NO_FOOD |
-R:G:AC_LEVEL | 
+R:G:AC_LEVEL
+R:G:NO_FOOD
+R:G:NO_STUN
 R:R:1:-5
-R:F:SPEED | SENS_FIRE | SLOW_DIGEST | 
+R:F:SENS_FIRE
+R:F:SLOW_DIGEST
+R:F:SPEED
 R:R:5:0
-R:F:SEE_INVIS | 
+R:F:SEE_INVIS
 R:R:20:0
-R:F:ESP_ORC | 
-R:F:ESP_TROLL | ESP_EVIL | 
-R:C:Warrior | Priest | Loremaster
+R:F:ESP_EVIL
+R:F:ESP_ORC
+R:F:ESP_TROLL
+R:C:Loremaster
+R:C:Priest
+R:C:Warrior
 R:O:70:32:2d3
 R:b:1:Tree walking
 R:k:+0:+200:Barehand-combat
 R:k:+0:+600:Boulder-throwing
-R:k:+500:+000:Disarming
 R:k:+500:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:-6000:+000:Stealth
-R:k:+500:+000:Sneakiness
 R:k:-300:+000:Weaponmastery
 R:k:-200:+000:Archery
 
@@ -1173,71 +1063,66 @@ R:N:16:RohanKnight
 R:D:Humans from the land of Rohan, riding the great Mearas.
 R:D:Fast and powerful in battle.
 R:S:4:-2:3:1:4:2:0
-R:K:10:5:5:-8:1:1:5:5
-R:P:10:220:0:84
-R:M:20:3:60:3:80:4:54:3:70:4
+R:P:10:220:0
 R:E:1:1:1:2:1:1
 R:Z:Rohan Knight's Powers
 R:R:1:3
-R:F:SPEED | 
+R:F:SPEED
 R:R:5:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:10:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:15:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:20:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:25:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:30:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:35:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:40:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:45:1
-R:F:SPEED | 
-R:C:Warrior | Priest
-R:k:+1000:+000:Disarming
+R:F:SPEED
+R:C:Priest
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+2500:+000:Spirituality
 R:k:-8000:+000:Stealth
-R:k:+100:+000:Sneakiness
 R:k:+100:+200:Weaponmastery
 R:k:+500:+000:Archery
-
 R:N:17:Thunderlord
 R:D:A thunderlord is a Great Eagle of Manwe, ridden by a Maia of Manwe.
 R:D:They carry the power of wind and thunder.
 R:S:6:2:1:1:3:8:2
-R:K:6:0:10:-16:30:10:15:5
-R:P:12:400:0:89
-R:M:14:6:180:6:255:25:150:4:230:20
+R:P:12:400:0
 R:E:1:1:1:2:1:1
 R:Z:Thunderlord's Powers
 R:R:1:0
-R:F:FEATHER | 
+R:F:FEATHER
 R:R:4:0
-R:F:ESP_DRAGON |
+R:F:ESP_DRAGON
 R:R:5:0
-R:F:RES_ELEC | 
+R:F:RES_ELEC
 R:R:10:0
-R:F:RES_COLD | 
+R:F:RES_COLD
 R:R:15:0
-R:F:RES_ACID | 
+R:F:RES_ACID
 R:R:17:0
-R:F:FLY | 
+R:F:FLY
 R:R:35:0
-R:F:RES_POIS | 
+R:F:RES_POIS
 R:R:45:0
-R:F:IM_ELEC | 
-R:C:Warrior | Mage | Archer | Priest
-R:k:+600:+000:Disarming
+R:F:IM_ELEC
+R:C:Archer
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 R:k:+000:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:-16000:+000:Stealth
-R:k:+3000:+000:Sneakiness
 R:k:+1500:+000:Weaponmastery
 R:k:+500:+000:Archery
 
@@ -1245,38 +1130,38 @@ R:N:18:DeathMold
 R:D:A pure mass of evilness, DeathMolds cannot move, but they have much more
 R:D:power than an average race.
 R:S:10:0:10:0:10:-15:-5
-R:K:15:-5:15:25:0:10:25:25
-R:P:15:250:10:100
-R:M:5:15:10:1:50:1:10:1:50:1
+R:P:15:250:10
 R:E:1:1:1:4:0:0
 R:Z:Death Mold's Powers
 R:G:EXPERIMENTAL
 R:R:1:0
-R:F:IMMOVABLE | HOLD_LIFE |
-R:F:RES_NETHER | RES_NEXUS | 
-R:C:Mage | Priest
+R:F:HOLD_LIFE
+R:F:IMMOVABLE
+R:F:RES_NETHER
+R:F:RES_NEXUS
+R:C:Mage
+R:C:Priest
 R:k:+0:+200:Necromancy
-R:k:+1500:+000:Disarming
 R:k:-500:+000:Magic-Device
 R:k:+7500:+000:Spirituality
 R:k:+25000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+2500:+000:Weaponmastery
 R:k:+2500:+000:Archery
 
 R:N:19:Yeek
 R:D:The weakest of all the races, bad at everything except gaining levels quickly.
 R:S:-5:-5:-5:-5:-5:-5:-5
-R:K:-5:-5:-10:0:-5:0:-10:-10
-R:P:6:25:2:29
-R:M:10:4:40:5:50:10:35:4:45:10
+R:P:6:25:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
-R:k:-500:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:-500:+000:Magic-Device
 R:k:-2500:+000:Spirituality
 R:k:-5000:+000:Stealth
-R:k:-500:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:-500:+000:Archery
 
@@ -1284,22 +1169,23 @@ R:N:20:Wood-Elf
 R:D:Elves are the first born, the Eldar.
 R:D:Wood elves live in the great forests of Middle-earth.
 R:S:-3:2:1:5:-4:1:0
-R:K:5:6:6:5:8:12:-25:40
-R:P:7:130:4:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:7:130:4
 R:E:1:1:1:2:1:1
-R:G:XTRA_MIGHT_BOW | 
+R:G:XTRA_MIGHT_BOW
 R:R:1:1
-R:F:XTRA_MIGHT | RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster
+R:F:RES_LITE
+R:F:XTRA_MIGHT
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 R:G:ELF
 R:k:+0:+200:Archery
 R:b:1:Tree walking
-R:k:+500:+000:Disarming
 R:k:+600:+000:Magic-Device
 R:k:+3000:+000:Spirituality
 R:k:+5000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:-2500:+000:Weaponmastery
 R:k:+4000:+000:Archery
 
@@ -1307,38 +1193,76 @@ R:N:21:Maia
 R:D:An old race, dating from before the creation of Arda, the Maiar were
 R:D:created by Eru to help the Valar in their task.
 R:S:0:0:0:0:0:0:4
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:91
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
 R:G:NO_GOD
 R:R:1:0
-R:F:AGGRAVATE | 
+R:F:AGGRAVATE
 R:R:20:0
-R:F:DRAIN_EXP | 
+R:F:DRAIN_EXP
 R:R:6:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:12:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:18:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:24:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:30:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:36:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:42:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:48:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
-R:C:Warrior | Archer | Mage
-R:k:+000:+000:Disarming
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
+R:C:Archer
+R:C:Mage
+R:C:Warrior
 R:k:+000:+000:Magic-Device
 R:k:+000:+000:Spirituality
 R:k:=0:=0:Prayer
 R:k:+000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1352,7 +1276,6 @@ R:k:+000:+000:Archery
 # S:S:str:int:wis:dex:con:chr:luck:mana
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
 # S:P:hitdie:xp%:infra
-# S:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
 # S:E:weapons:torso:arms:finger:head:legs
 # S:A:allowed races
 # S:C:'A'llow/'F'orbid:allowed/forbiden classes
@@ -1368,14 +1291,30 @@ I:
 S:N:0: 
 S:D:A:A normal member of the race.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Thunderlord | 
-S:A:DeathMold | Yeek | Wood-Elf | Maia | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 
 # Just a place holder, the actualy setting are done with corruptions, see
 # corrupt.lua and player.lua
@@ -1383,13 +1322,23 @@ S:N:1:Vampire
 S:D:B:Vampires are powerful undead, wielding great powers. They still fear the
 S:D:B:sunlight and cannot easily satiate their hunger.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Hobbit | Gnome | Dwarf | Orc |
-S:A:Troll | Dunadan | Half-Ogre | Beorning | Kobold | Petty-Dwarf | 
-S:A:Dark-Elf | RohanKnight | Yeek | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Yeek
 S:C:A:Mage
 S:O:70:0:5d3
 S:O:70:32:2d3
@@ -1398,24 +1347,44 @@ S:N:2:Spectre
 S:D:B:Spectres only partially exist in the mortal world and so they can
 S:D:B:pass through walls. They are somewhat physically weak.
 S:S:-5:1:1:2:-3:-6:-3:105
-S:K:2:8:7:2:2:7:-5:-2
 S:P:-4:80:3
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:C:F:Warrior | Archer
-S:G:UNDEAD | NO_CUT | NO_FOOD | SEMI_WRAITH | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_COLD | RES_POIS | RES_NETHER | 
+S:F:HOLD_LIFE
+S:F:RES_COLD
+S:F:RES_NETHER
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:O:70:32:2d3
-S:k:+200:+000:Disarming
 S:k:+800:+000:Magic-Device
 S:k:+700:+000:Spirituality
 S:k:+2000:+000:Stealth
-S:k:+200:+000:Sneakiness
 S:k:-500:+000:Weaponmastery
 S:k:-200:+000:Archery
 
@@ -1423,70 +1392,102 @@ S:N:3:Skeleton
 S:D:B:Yet an other kind of undead. Their physical 'body' is not very vulnerable
 S:D:B:to sharp things.
 S:S:0:-2:-2:0:1:-4:-3:70
-S:K:-5:-5:5:-1:-1:8:8:0
 S:P:0:45:1
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:G:UNDEAD | NO_CUT | NO_FOOD | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:RES_POIS | RES_SHARDS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:RES_SHARDS
+S:F:SEE_INVIS
 S:R:10:0
-S:F:RES_COLD | 
+S:F:RES_COLD
 S:O:70:32:2d3
-S:k:-500:+000:Disarming
 S:k:-500:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
 S:k:+800:+000:Weaponmastery
 S:k:+000:+000:Archery
 
 S:N:4:Zombie
 S:D:B:Strong and dumb is a zombie.
 S:S:2:-6:-6:1:4:-5:-4:70
-S:K:-2:-2:5:-1:-1:2:5:0
 S:P:3:45:1
-S:M:50:15:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:C:F:Mage
-S:G:UNDEAD | NO_FOOD | NO_SUBRACE_CHANGE
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_POIS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:R:5:0
-S:F:RES_COLD | 
+S:F:RES_COLD
 S:O:70:32:2d3
-S:k:-200:+000:Disarming
 S:k:-200:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
 S:k:+500:+000:Weaponmastery
 S:k:+000:+000:Archery
 
 S:N:5:Barbarian
 S:D:A:Hardy members of their race, they are strong fighters but poor spellcasters.
 S:S:2:-3:-2:1:1:-3:1:50
-S:K:-2:-10:2:-2:0:1:12:5
 S:P:1:25:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Dwarf | Orc | Troll | Half-Ogre | Beorning | 
+S:A:Beorning
+S:A:Dwarf
+S:A:Half-Ogre
+S:A:Human
+S:A:Orc
+S:A:Troll
 S:C:F:Mage
 S:R:10:0
-S:F:RES_FEAR | 
-S:k:-200:+000:Disarming
+S:F:RES_FEAR
 S:k:-1000:+000:Magic-Device
 S:k:+200:+000:Spirituality
 S:k:-2000:+000:Stealth
-S:k:+000:+000:Sneakiness
 S:k:+1200:+000:Weaponmastery
 S:k:+500:+000:Archery
 
@@ -1494,36 +1495,64 @@ S:N:6:Hermit
 S:D:A:Through years of isolation hermits can manage to increase their mana
 S:D:A:reserves but at the cost of an increased physical weakness.
 S:S:-3:1:1:-3:-3:1:0:120
-S:K:5:10:5:3:4:10:-5:-5
 S:P:-3:20:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Dunadan | High-Elf | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | 
-S:A:Thunderlord | DeathMold | Yeek | Wood-Elf | Maia | 
-S:C:F:Warrior | Archer
-S:k:+500:+000:Disarming
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
 S:k:+1000:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:+3000:+000:Stealth
-S:k:+400:+000:Sneakiness
 S:k:-500:+000:Weaponmastery
 S:k:-500:+000:Archery
 
 S:N:8:LostSoul
 S:D:A:In some very rare occasions souls can come back from the Halls of Mandos.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:G:ASTRAL | NO_SUBRACE_CHANGE
+S:G:ASTRAL
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:SEE_INVIS
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Thunderlord | 
-S:A:DeathMold | Yeek | Wood-Elf | Maia | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:O:70:32:25d2
 S:O:70:12:25d3
 
@@ -1531,394 +1560,5 @@ S:O:70:12:25d3
 S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# H: Race history
-# H:index:chance:chart:next chart:social class bonus:desc
-
-# Dunadan, Human: 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# RohanKnight:   84 -> 85 -> 50 -> 51 -> 52 -> 53.
-# Half-Ogre:     74 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Beorning:      75 -> 76 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Half-elf:       4 -> 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Elf,  Wood-elf: 5 -> 6 -> 9 -> 54 -> 55 -> 56.
-# High-elf:       7 -> 8 -> 9 -> 54 -> 55 -> 56.
-# Dark-elf:      69 -> 70 -> 71 -> 72 -> 73.
-# Hobbit:        10 -> 11 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Gnome:         13 -> 14 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Dwarf:         16 -> 17 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Petty-Dwarf:   87 -> 88 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Thunderlord:   89 -> 90 -> 93 -> 94.
-# Maia:          91 -> 92 -> 93 -> 94.
-# Ent:           95 -> 96.
-# Troll:         22 -> 23 -> 24 -> 62 -> 63 -> 64 -> 65 -> 66.
-# Orc            25 -> 26 -> 27 -> 28 -> 80 -> 81 -> 65 -> 66.
-# Yeek:          29 -> 3 -> 50 -> 51 -> 52 -> 53.
-#   (not used:   78 -> 79 -> 80 -> 81 -> 65 -> 66.)
-# Kobold:        82 -> 83 -> 80 -> 81 -> 65 -> 66.
-# Deathmold:    100 -> 101 -> 102 -> 103 -> 104.
-
-H:0:10:1:2:25:You are the illegitimate and unacknowledged child 
-H:1:20:1:2:35:You are the illegitimate but acknowledged child 
-H:2:95:1:2:45:You are one of several children 
-H:3:100:1:2:50:You are the first child 
-
-H:4:40:2:3:65:of a Serf.  
-H:5:65:2:3:80:of a Yeoman.  
-H:6:80:2:3:90:of a Townsman.  
-H:7:90:2:3:105:of a Guildsman.  
-H:8:96:2:3:120:of a Landed Knight.  
-H:9:99:2:3:130:of a Noble Lord.  
-H:10:100:2:3:140:of the Royal Blood Line.  
-
-H:11:20:3:50:20:You are the black sheep of the family.  
-H:12:80:3:50:55:You are a credit to the family.  
-H:13:100:3:50:60:You are a well-liked child.  
-
-H:14:25:4:1:40:Your mother was of the Avari.  
-H:15:40:4:1:50:Your father was of the Avari.  
-H:16:65:4:1:60:Your mother was of the Nandor.  
-H:17:80:4:1:60:Your father was of the Nandor.  
-H:18:96:4:1:70:Your mother was of the Sindar.  
-H:19:99:4:1:70:Your father was of the Sindar.  
-H:20:100:4:1:100:Your ancestry traces to Elrond.  
-
-H:21:60:5:6:50:You are one of several children 
-H:22:100:5:6:55:You are the only child 
-
-H:23:40:6:9:40:of an Avarin 
-H:24:70:6:9:50:of a Nandorin 
-H:25:100:6:9:60:of a Sindarin 
-
-H:26:60:7:8:50:You are one of several children 
-H:27:100:7:8:55:You are the only child 
-
-H:28:75:8:9:50:of a Telerin 
-H:29:95:8:9:55:of a Noldorin 
-H:30:100:8:9:60:of a Vanyarin 
-
-H:31:40:9:54:80:Ranger.  
-H:32:70:9:54:90:Archer.  
-H:33:87:9:54:110:Warrior.  
-H:34:95:9:54:125:Mage.  
-H:35:99:9:54:140:Prince.  
-H:36:100:9:54:145:King.  
-
-H:37:85:10:11:45:You are one of several children of a Hobbit 
-H:38:100:10:11:55:You are the only child of a Hobbit 
-
-H:39:20:11:3:55:Bum.  
-H:40:30:11:3:80:Tavern Owner.  
-H:41:40:11:3:90:Miller.  
-H:42:50:11:3:100:Home Owner.  
-H:43:80:11:3:110:Burglar.  
-H:44:95:11:3:115:Warrior.  
-H:45:99:11:3:125:Mage.  
-H:46:100:11:3:140:Clan Elder.  
-
-H:47:85:13:14:45:You are one of several children of a Gnome 
-H:48:100:13:14:55:You are the only child of a Gnome 
-
-H:49:20:14:3:55:Beggar.  
-H:50:50:14:3:70:Braggart.  
-H:51:75:14:3:85:Prankster.  
-H:52:95:14:3:100:Warrior.  
-H:53:100:14:3:125:Mage.  
-
-H:54:25:16:17:40:You are one of two children of a Dwarven 
-H:55:100:16:17:50:You are the only child of a Dwarven 
-
-H:56:10:17:18:60:Thief.  
-H:57:35:17:18:80:Smith.  
-H:58:75:17:18:90:Miner.  
-H:59:90:17:18:110:Warrior.  
-H:60:99:17:18:130:Priest.  
-H:61:100:17:18:150:King.  
-
-H:62:15:18:57:10:You are the black sheep of the family.  
-H:63:85:18:57:50:You are a credit to the family.  
-H:64:100:18:57:55:You are a well liked child.  
-
-H:65:100:20:2:50:You are the adopted child 
-
-H:66:100:22:23:50:You are the offspring of a 
-
-H:67:30:23:24:20:Forest-Troll 
-H:68:60:23:24:25:Cave-Troll 
-H:69:75:23:24:30:Hill-Troll 
-H:70:90:23:24:35:Stone-Troll 
-H:71:95:23:24:40:Snow-Troll 
-H:72:100:23:24:45:Water-Troll 
-
-H:73:25:24:62:50:Worker.  
-H:74:95:24:62:55:Warrior.  
-H:75:99:24:62:65:Shaman.  
-H:76:100:24:62:80:Clan Chief.  
-
-H:77:100:25:26:50:You are one of several children of 
-
-H:78:40:26:27:40:a Snaga 
-H:79:80:26:27:50:an Orc 
-H:80:100:26:27:60:an Uruk 
-
-H:81:30:27:28:20:Slave 
-H:82:60:27:28:50:Archer 
-H:83:90:27:28:60:Warrior 
-H:84:95:27:28:80:Shaman 
-H:85:100:27:28:100:Chieftain 
-
-H:86:30:28:80:50:from the Misty Mountains.  
-H:87:60:28:80:50:from the Grey Mountains.  
-H:88:90:28:80:70:from the orc-hold of Mount Gundabad.  
-H:89:100:28:80:80:from the Pits of Angband.  
-
-H:90:25:29:3:50:You are one of five children of a blue Yeek.  
-H:91:75:29:3:75:You are one of five children of a brown Yeek.  
-H:92:100:29:3:100:You are one of five children of a master Yeek.  
-
-H:93:20:50:51:50:You have dark brown eyes, 
-H:94:60:50:51:50:You have brown eyes, 
-H:95:70:50:51:50:You have hazel eyes, 
-H:96:80:50:51:50:You have green eyes, 
-H:97:90:50:51:50:You have blue eyes, 
-H:98:100:50:51:50:You have blue-gray eyes, 
-
-H:99:70:51:52:50:straight 
-H:100:90:51:52:50:wavy 
-H:101:100:51:52:50:curly 
-
-H:102:30:52:53:50:black hair, 
-H:103:70:52:53:50:brown hair, 
-H:104:80:52:53:50:auburn hair, 
-H:105:90:52:53:50:red hair, 
-H:106:100:52:53:50:blond hair, 
-
-H:107:10:53:0:50:and a very dark complexion.
-H:108:30:53:0:50:and a dark complexion.
-H:109:80:53:0:50:and an average complexion.
-H:110:90:53:0:50:and a fair complexion.
-H:111:100:53:0:50:and a very fair complexion.
-
-H:112:85:54:55:50:You have light grey eyes, 
-H:113:95:54:55:50:You have light blue eyes, 
-H:114:100:54:55:50:You have light green eyes, 
-
-H:115:75:55:56:50:straight 
-H:116:100:55:56:50:wavy 
-
-H:117:75:56:0:50:black hair, and a fair complexion.
-H:118:85:56:0:50:brown hair, and a fair complexion.
-H:119:95:56:0:50:blond hair, and a fair complexion.
-H:120:100:56:0:50:silver hair, and a fair complexion.
-
-H:121:99:57:58:50:You have dark brown eyes, 
-H:122:100:57:58:60:You have glowing red eyes, 
-
-H:123:90:58:59:50:straight 
-H:124:100:58:59:50:wavy 
-
-H:125:75:59:60:50:black hair, 
-H:126:100:59:60:50:brown hair, 
-
-H:127:25:60:61:50:a one foot beard, 
-H:128:60:60:61:51:a two foot beard, 
-H:129:90:60:61:53:a three foot beard, 
-H:130:100:60:61:55:a four foot beard, 
-
-H:131:100:61:0:50:and a dark complexion.
-
-H:132:60:62:63:50:You have slime green eyes, 
-H:133:85:62:63:50:You have puke yellow eyes, 
-H:134:99:62:63:50:You have blue-bloodshot eyes, 
-H:135:100:62:63:55:You have glowing red eyes, 
-
-H:136:33:63:64:50:dirty 
-H:137:66:63:64:50:mangy 
-H:138:100:63:64:50:oily 
-
-H:139:33:64:65:50:sea-weed green hair, 
-H:140:66:64:65:50:bright red hair, 
-H:141:100:64:65:50:dark purple hair, 
-
-H:142:25:65:66:50:and green 
-H:143:50:65:66:50:and blue 
-H:144:75:65:66:50:and white 
-H:145:100:65:66:50:and black 
-
-H:146:33:66:0:50:ulcerous skin.
-H:147:66:66:0:50:scabby skin.
-H:148:100:66:0:50:leprous skin.
-
-H:149:85:69:70:45:You are one of several children of a Dark Elven 
-H:150:100:69:70:55:You are the only child of a Dark Elven 
-
-H:151:50:70:71:60:Warrior.  
-H:152:80:70:71:75:Warlock.  
-H:153:100:70:71:95:Noble.  
-
-H:154:100:71:72:50:You have black eyes, 
-
-H:155:70:72:73:50:straight 
-H:156:90:72:73:50:wavy 
-H:157:100:72:73:50:curly 
-
-H:158:100:73:0:50:black hair and a very dark complexion.
-
-H:159:25:74:20:25:Your mother was an Ogre, but it is unacknowledged.  
-H:160:100:74:20:25:Your father was an Ogre, but it is unacknowledged.  
-
-H:161:90:75:76:50:You are a descendant of Beorn to the 
-H:162:100:75:20:100:Your father was Beorn.  
-
-H:163:13:76:20:55:9th degree.  
-H:164:25:76:20:60:8th degree.  
-H:165:38:76:20:65:7th degree.  
-H:166:50:76:20:70:6th degree.  
-H:167:63:76:20:75:5th degree.  
-H:168:75:76:20:80:4th degree.  
-H:169:88:76:20:85:3rd degree.  
-H:170:100:76:20:90:2nd degree.  
-
-H:171:100:78:79:50:You are one of several children of 
-
-H:172:50:79:80:50:a Brown Yeek.  
-H:173:75:79:80:50:a Blue Yeek.  
-H:174:95:79:80:85:a Master Yeek.  
-H:175:100:79:80:120:Boldor, the King of the Yeeks.  
-
-H:176:25:80:81:50:You have pale eyes, 
-H:177:50:80:81:50:You have glowing eyes, 
-H:178:75:80:81:50:You have tiny black eyes, 
-H:179:100:80:81:50:You have shining black eyes, 
-
-H:180:20:81:65:50:no hair at all, 
-H:181:40:81:65:50:short black hair, 
-H:182:60:81:65:50:long black hair, 
-H:183:80:81:65:50:bright red hair, 
-H:184:100:81:65:50:colourless albino hair, 
-
-H:185:100:82:83:50:You are one of several children of 
-
-H:186:40:83:80:50:a Small Kobold.  
-H:187:75:83:80:55:a Kobold.  
-H:188:95:83:80:65:a Large Kobold.  
-H:189:100:83:80:100:Mughash, the Kobold Lord.  
-
-H:190:85:84:85:45:You are one of several children 
-H:191:100:84:85:50:You are the first child 
-
-H:192:60:85:50:40:of a Serf.  
-H:193:85:85:50:55:of a Devoted Mercenary.  
-H:194:96:85:50:60:of a Landed Knight.  
-H:195:99:85:50:100:of a Marshal of the Riddermark.  
-H:196:100:85:50:120:of a King of the Rohirrim.  
-
-H:197:100:87:88:89:You are one of several children of 
-
-H:198:30:88:18:20:a Petty-Dwarf Slave.  
-H:199:50:88:18:40:a Petty-Dwarf Thief.  
-H:200:70:88:18:60:a Petty-Dwarf Smith.  
-H:201:90:88:18:75:a Petty-Dwarf Miner.  
-H:202:95:88:18:100:a Petty-Dwarf Shaman.  
-H:203:100:88:18:100:Mim, Betrayer of Turin.  
-
-H:204:85:89:90:50:You are one of many Manwe Maia.  
-H:205:100:89:90:60:You are the one of the most famous Manwe Maia.  
-
-H:206:90:90:93:100:Your eagle looks very good.  
-H:207:100:90:93:120:Your eagle is splendid.  
-
-H:208:10:91:92:20:You are a unnoticed minion of 
-H:209:25:91:92:30:You are a minor servant of 
-H:210:45:91:92:40:You are a subject of 
-H:211:65:91:92:50:You have attached yourself to 
-H:212:85:91:92:65:You are associated with 
-H:213:95:91:92:80:You are a notable follower of 
-H:214:100:91:92:100:You are a celebrated assistant to 
-
-H:215:20:92:93:55:Nessa.  
-H:216:40:92:93:60:Vana.  
-H:217:50:92:93:65:Tulkas.  
-H:218:80:92:93:75:Mandos.  
-H:219:90:92:93:80:Nienna.  
-H:220:95:92:93:90:Varda.  
-H:221:100:92:93:95:Manwe.  
-
-H:222:100:93:94:50:In the past you dwelt on earth in the form of 
-
-H:223:25:94:0:50:various animals.
-H:224:55:94:0:55:a spirit of forest and river.
-H:225:70:94:0:60:a beneficent but unseen force.
-H:226:96:94:0:70:a wise and ancient counsellor.
-H:227:100:94:0:80:a Wizard of legend.
-
-H:228:30:95:96:30:You are of an unknown generation of the Ents.  
-H:229:40:95:96:50:You are of the third generation of the Ents.  
-H:230:60:95:96:60:You are of the second generation of the Ents.  
-H:231:100:95:96:80:You are one of the first beings who awoke on Arda.  
-
-H:232:50:96:0:50:You have green skin and inflexible members.
-H:233:100:96:0:50:You have brown skin and inflexible members.
-
-H:234:10:100:101:30:You were born in dirty bilge-water, 
-H:235:20:100:101:35:You were born in dirty straw, 
-H:236:30:100:101:40:You were born in wet mud, 
-H:237:40:100:101:45:You were born in a pile of dust, 
-H:238:50:100:101:50:You were born in sand, 
-H:239:60:100:101:50:You were born in pebbles, 
-H:240:70:100:101:55:You were born in a kobold corpse, 
-H:241:80:100:101:60:You were born in dragon droppings, 
-H:242:90:100:101:65:You were born in a pile of bones, 
-H:243:100:100:101:70:You were born in a corpse of a mighty hero, 
-
-H:244:10:101:102:30:created by rotting flesh.  
-H:245:20:101:102:35:created by a kobold magician.  
-H:246:30:101:102:40:created by a corrupted apprentice.  
-H:247:40:101:102:45:created by a curious mage apprentice.  
-H:248:50:101:102:50:created by an evil Symbiant.  
-H:249:60:101:102:50:created by a practicing Necromancer.  
-H:250:70:101:102:55:created by the Mutant Breeders.  
-H:251:80:101:102:60:created by a curious adventurer.  
-H:252:90:101:102:65:called to life by the Witch-King of Angmar.  
-H:253:100:101:102:70:called to life by Sauron himself.  
-
-H:254:100:102:103:50:Since then you have given life to 
-
-H:255:10:103:104:30:no 
-H:256:20:103:104:35:one weak-willed 
-H:257:30:103:104:40:two 
-H:258:40:103:104:45:three 
-H:259:50:103:104:50:four 
-H:260:60:103:104:50:five 
-H:261:70:103:104:55:about twenty 
-H:262:80:103:104:60:dozens of 
-H:263:90:103:104:65:hundreds of 
-H:264:100:103:104:70:uncounted multitudes of 
-
-H:265:100:104:0:50:foul offspring.
-
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# M:N:idx:color:Meta class name
-# M:C:class name
-
-I:
-
-M:N:0:U:Classes       -- The Classes of Middle-earth
-M:C:Warrior
-M:C:Archer
-M:C:Rogue
-M:C:Mage
-M:C:Priest
-M:C:Loremaster
diff --git a/lib/edit/qrand1.map b/lib/edit/qrand1.map
index f42cbf1c..041e221c 100644
--- a/lib/edit/qrand1.map
+++ b/lib/edit/qrand1.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
diff --git a/lib/edit/qrand10.map b/lib/edit/qrand10.map
index ae45b9cb..cfe57e16 100644
--- a/lib/edit/qrand10.map
+++ b/lib/edit/qrand10.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:2056:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
@@ -26,11 +23,11 @@ F:F:85:12
 D:                   
 D:      xxxxxxx      
 D:      xFFFFFx      
-D: xxxxxx,t.ttxxxx   
-D: xFFG,t....t,,,xxx 
-D: xFpG.......t.t.DD 
-D: xFFG,t....t,,,xxx 
-D: xxxxxx,t.ttxxxx   
+D: xxxxxx,....xxxx   
+D: xFFG,......,,,xxx 
+D: xFpG...........DD 
+D: xFFG,......,,,xxx 
+D: xxxxxx,....xxxx   
 D:      xFFFFFx      
 D:      xxxxxxx      
 D:                   
diff --git a/lib/edit/qrand11.map b/lib/edit/qrand11.map
index 4af3c266..67d5258a 100644
--- a/lib/edit/qrand11.map
+++ b/lib/edit/qrand11.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:L:85:6
 
diff --git a/lib/edit/qrand12.map b/lib/edit/qrand12.map
index 4621ef0b..f24a7927 100644
--- a/lib/edit/qrand12.map
+++ b/lib/edit/qrand12.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:187:6
 
diff --git a/lib/edit/qrand14.map b/lib/edit/qrand14.map
index 9f339db0..ee6e8975 100644
--- a/lib/edit/qrand14.map
+++ b/lib/edit/qrand14.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/edit/qrand6.map b/lib/edit/qrand6.map
index 3b55e985..407a9083 100644
--- a/lib/edit/qrand6.map
+++ b/lib/edit/qrand6.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/edit/qrand7.map b/lib/edit/qrand7.map
index a7c0607f..4da79778 100644
--- a/lib/edit/qrand7.map
+++ b/lib/edit/qrand7.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
@@ -26,10 +23,10 @@ F:W:84:6
 F:w:187:6
 
 # Dungeon wayout
-D:ttttt      
-D:tGGGt  ,x, 
-D:tGpGt  x,x 
-D:tGGGt  ,x, 
-D:ttttt      
+D:           
+D: GGG   ,x, 
+D: GpG   x,x 
+D: GGG   ,x, 
+D:           
 D:      ,x,  
 D:           
diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 5c93f1f6..7eebf70c 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -129,6 +129,7 @@
 # S: spell frequency |
 # S: spell type | spell type | etc
 # D: Description
+# A: a_ptr_index : %chance
 
 # 'N' indicates the beginning of an entry. The serial number must
 # increase for each new item. Entry 0 is used for the player.
@@ -199,10 +200,18 @@ E:1:1:1:2:1:1
 O:1:1:1:1
 B:BEG:*
 B:TOUCH:EAT_GOLD
-F:MALE | EVIL | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 |  FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He looks squalid and thoroughly revolting. 
 
 N:2:Scrawny cat
@@ -212,9 +221,15 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d1
-F:RAND_25 | WILD_TOO | WILD_GRASS | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOO
+F:WILD_TOWN
 D:A skinny little furball with sharp claws and a menacing look. 
 
 N:3:Sparrow
@@ -224,9 +239,15 @@ W:0:3:90:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:Utterly harmless, except when angry. 
 
 N:4:Chaffinch
@@ -236,9 +257,16 @@ W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Utterly harmless, except when angry. 
 
 N:5:Wild rabbit
@@ -248,9 +276,14 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It is not a carnivore, but will defend itself if you stray too 
 D:close. 
 
@@ -261,11 +294,19 @@ W:0:1:1000:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:MALE | WILD_ONLY | WILD_WOOD |
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | HAS_LITE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_WOOD
 D:He has a strong axe with a sharp edge. 
 
 N:7:Scruffy little dog
@@ -275,8 +316,13 @@ W:0:3:300:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:A thin flea-ridden mutt, growling as you get close. 
 
 N:8:Farmer Maggot
@@ -287,12 +333,22 @@ E:0:1:1:2:1:1
 O:0:100:0:0
 #B:MOAN:*
 #B:MOAN:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | NO_TARGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
 F:NEVER_MOVE
-F:OPEN_DOOR | BASH_DOOR | SPECIAL_GENE
-F:NEUTRAL | NO_DEATH
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:NO_DEATH
+F:NO_TARGET
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He's lost his dogs. He's had his mushrooms stolen. He's not a happy 
 D:hobbit! 
 
@@ -303,9 +359,16 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He tends to blubber a lot. 
 
 N:10:Boil-covered wretch
@@ -315,10 +378,18 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY |
-F:RAND_25 | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Ugly doesn't begin to describe him. 
 
 N:11:Village idiot
@@ -328,9 +399,16 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Drooling and comical, but then, what do you expect? 
 
 N:12:Pitiful-looking beggar
@@ -340,10 +418,17 @@ W:0:1:1300:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You just can't help feeling sorry for him. 
 
 N:13:Mangy-looking leper
@@ -354,10 +439,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
 B:TOUCH:DISEASE
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You feel it isn't safe to touch him. 
 
 N:14:Agent of the black market
@@ -369,11 +461,21 @@ O:25:50:20:5
 B:HIT:HURT:1d6
 B:TOUCH:EAT_ITEM
 B:INSULT:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:DROP_60 | WILD_TOWN |
-F:WILD_SWAMP | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:He 'finds' new wares for the Black Market. From unwary adventurers... 
 
 N:15:Singing, happy drunk
@@ -383,11 +485,19 @@ W:0:1:1100:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE |
-F:RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He makes you glad to be sober. 
 
 N:16:Aimless-looking merchant
@@ -397,10 +507,19 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:MALE | RAND_50 | 
-F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:The typical ponce around town, with purse jingling, and looking for more 
 D:amulets of adornment to buy. 
 
@@ -411,10 +530,21 @@ W:0:1:1700:0
 E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_GRASS | WILD_TOWN | WILD_WOOD | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:No job is too low for him. 
 
 N:18:Battle-scarred veteran
@@ -424,10 +554,18 @@ W:0:1:1650:0
 E:1:1:1:2:1:1
 O:25:50:25:0
 B:HIT:HURT:2d6
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't take to strangers kindly. 
 
 N:19:Martti Ihrasaari
@@ -438,11 +576,20 @@ E:0:1:1:2:1:1
 O:50:50:0:0
 B:SHOW:*
 B:SHOW:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD |
-F:OPEN_DOOR | BASH_DOOR | 
-F:JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He weighs 127 kg. He is the president of some remote country. 
 
 ##### Normal monsters #####
@@ -455,11 +602,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A small strange growth. 
 
 N:21:Large white snake
@@ -470,9 +622,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:CRUSH:HURT:1d1
-F:RAND_50 | WILD_TOO |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is about eight feet long. 
 
 N:22:Grey mushroom patch
@@ -482,10 +639,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 N:23:Newt
@@ -496,9 +658,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:WEIRD_MIND | CAN_SWIM | WILD_TOO | DROP_CORPSE | 
-F:WILD_GRASS | WILD_WASTE | WILD_SHORE | WILD_SWAMP | WILD_MOUNTAIN |
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
 D:A small, harmless lizard. 
 
 N:24:Giant white centipede
@@ -509,9 +679,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
 B:STING:HURT:1d2
-F:RAND_50 | DROP_SKELETON |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:25:White icky thing
@@ -521,8 +695,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:EMPTY_MIND | DROP_CORPSE | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:RAND_25
+F:RAND_50
 D:It is a smallish, slimy, icky creature. 
 
 N:26:Clear icky thing
@@ -532,9 +709,13 @@ W:1:1:500:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:INVISIBLE | EMPTY_MIND | DROP_CORPSE | BASEANGBAND
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:INVISIBLE
+F:RAND_25
+F:RAND_50
 D:It is a smallish, slimy, icky, blobby creature. 
 
 N:27:Giant white mouse
@@ -544,10 +725,13 @@ W:1:1:600:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | WILD_TOO | WILD_GRASS |
-F:CAN_SWIM |
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND |
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
 S:MULTIPLY
 D:It is about three feet long with large teeth. 
 
@@ -559,9 +743,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:CRUSH:HURT:1d4
-F:RAND_25 | CAN_SWIM |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
 D:It is about eight feet long. 
 
 N:29:Small kobold
@@ -571,10 +760,16 @@ W:1:1:800:5
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d5
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:It is a small, dog-headed humanoid figure. 
 
 N:30:Kobold
@@ -584,10 +779,16 @@ W:2:1:900:5
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d8
-F:DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:It is a squat and ugly dog-headed humanoid. 
 
 N:31:White worm mass
@@ -597,10 +798,17 @@ W:1:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | HURT_LITE | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -611,8 +819,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
 D:A disembodied eye, floating a few feet above the ground. 
 
 N:33:Rock lizard
@@ -622,23 +833,15 @@ W:1:1:100:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is a small lizard with a hardened hide. 
 
-N:34:Grid bug
-G:I:v
-I:110:2d4:10:2:10
-W:1:1:10:2
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:BITE:ELEC:1d4
-F:RAND_25 | FRIENDS | CAN_FLY |
-F:STUPID | WEIRD_MIND |
-F:ANIMAL | NO_FEAR | IM_ELEC | ZANGBAND
-D:A strange electric bug. 
-
 N:35:Jackal
 G:C:U
 I:110:1d4:10:3:10
@@ -646,9 +849,14 @@ W:1:1:400:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:FRIENDS |
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a yapping snarling dog, dangerous when in a pack. 
 
 N:36:Soldier ant
@@ -658,9 +866,13 @@ W:1:1:300:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | WILD_TOO | WILD_GRASS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:A large ant with powerful mandibles. 
 
 N:37:Fruit bat
@@ -670,8 +882,13 @@ W:1:1:20:1
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_SWAMP | DROP_CORPSE
-F:MORTAL | BASEANGBAND | AI_ANNOY
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving pest. 
 
 N:38:Insect swarm
@@ -682,9 +899,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:STING:HURT:1d1
-F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_TOO | WILD_GRASS |
-F:WILD_WOOD | WILD_SWAMP | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A lone insect may be harmless, but there's a whole swarm of 
 D:them here! 
 
@@ -697,11 +921,30 @@ O:0:0:0:0
 B:GAZE:*
 B:GAZE:*
 B:CRUSH:*
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD | UNIQUE | 
-F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU | NO_SLEEP | NO_CONF
-F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | JOKEANGBAND | HAS_LITE
-S:1_IN_9 |
-S:TPORT | BLINK | TELE_AWAY
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:NO_CONF
+F:NO_SLEEP
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+F:UNIQUE
+S:1_IN_9
+S:BLINK
+S:TELE_AWAY
+S:TPORT
 D:This unholy abomination will crush you. Flee while you can! 
 
 N:40:Shrieker mushroom patch
@@ -710,11 +953,19 @@ I:110:1d1:4:1:0
 W:2:1:40:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | WILD_TOO | WILD_SWAMP | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:Yum!  It looks quite tasty.  It doesn't sound so nice, though... 
 
@@ -728,9 +979,14 @@ B:CRAWL:POISON:1d4
 B:CRAWL:EAT_FOOD
 B:DROOL:*
 B:DROOL:*
-F:RAND_50 | DROP_90 | CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | TAKE_ITEM | KILL_BODY | 
-F:IM_POIS | BASEANGBAND
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:KILL_BODY
+F:RAND_50
+F:TAKE_ITEM
 D:It is a smallish, slimy, icky, hungry creature. 
 
 N:42:Metallic green centipede
@@ -740,9 +996,13 @@ W:3:1:500:5
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:1d2
-F:RAND_50 | WILD_TOO | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:43:Novice warrior
@@ -753,10 +1013,15 @@ E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 N:44:Novice rogue
@@ -767,10 +1032,16 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:45:Novice priest
@@ -780,13 +1051,21 @@ W:2:1:1500:6
 E:1:1:1:2:1:1
 O:25:0:50:20
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:46:Novice mage
@@ -796,13 +1075,21 @@ W:2:1:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:47:Yellow mushroom patch
@@ -812,11 +1099,16 @@ W:2:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d6
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:48:White jelly
@@ -826,10 +1118,16 @@ W:2:1:2000:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It's a large pile of white flesh. 
 
 N:49:Giant black ant
@@ -839,10 +1137,15 @@ W:2:1:500:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:WEIRD_MIND | DROP_SKELETON | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is about three feet long.
 
 N:50:Salamander
@@ -852,9 +1155,15 @@ W:2:1:100:10
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:RAND_25 | CAN_SWIM | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | SUSCEP_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A small black and orange lizard. 
 
 N:51:White harpy
@@ -866,8 +1175,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d1
 B:CLAW:HURT:1d1
 B:BITE:HURT:1d2
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | 
-F:RAND_50 | DROP_CORPSE | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A flying, screeching bird with a woman's face. 
 
 N:52:Blue yeek
@@ -877,10 +1193,13 @@ W:2:1:700:4
 E:1:1:1:2:1:1
 O:25:0:0:55
 B:HIT:HURT:1d5
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:A small humanoid figure. 
 
 N:53:Grip, Farmer Maggot's dog
@@ -890,10 +1209,14 @@ W:2:2:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR | ANIMAL
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -904,10 +1227,14 @@ W:2:2:650:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -918,10 +1245,14 @@ W:2:2:700:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -932,25 +1263,14 @@ W:2:1:200:6
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_25 | WILD_ONLY | WILD_SHORE | WILD_SWAMP | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
-D:It is as big as a wolf. 
-
-N:57:Freesia
-G:f:u
-I:120:6d5:30:30:0
-W:2:1:450:32
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d3
-B:CLAW:HURT:1d4
-F:UNIQUE | 
-F:FORCE_MAXHP | DROP_SKELETON
-F:BASH_DOOR | 
 F:ANIMAL
-F:MORTAL | ZANGBAND
-D:A striped housecat who enjoys hunting. 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_SHORE
+D:It is as big as a wolf. 
 
 N:58:Green worm mass
 G:w:g
@@ -959,11 +1279,17 @@ W:2:1:40:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_ACID | CAN_SWIM | 
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_ACID
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -975,8 +1301,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:HURT:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:60:Cave spider
@@ -986,10 +1319,15 @@ W:2:1:400:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:FRIENDS | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | SPIDER | HURT_LITE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
 D:It is a black spider that moves in fits and starts. 
 
 N:61:Crow
@@ -1000,8 +1338,13 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, gray except for the black wings and head. 
 
 N:62:Wild cat
@@ -1012,8 +1355,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:BASH_DOOR | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_TOO
 D:A larger than normal feline, hissing loudly. Its velvet claws conceal a 
 D:fistful of needles. 
 
@@ -1024,12 +1371,27 @@ W:3:2:670:16
 E:1:1:1:2:1:1
 O:50:50:0:0
 B:TOUCH:EAT_GOLD
-F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | DROP_CHOSEN | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
-F:EVIL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:Usually known as Gollum.  He's been sneaking, and he wants his 'precious.' 
 
 N:64:Green ooze
@@ -1039,10 +1401,18 @@ W:3:2:300:4
 E:0:0:0:0:0:0
 O:50:0:25:20
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | DROP_90 | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_90
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
 D:It's green and it's oozing. 
 
 N:65:Poltergeist
@@ -1052,12 +1422,24 @@ W:3:1:0:8
 E:0:0:0:0:0:0
 O:50:5:30:10
 B:TOUCH:TERRIFY
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:DROP_60 | DROP_90 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | TAKE_ITEM | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
 S:BLINK
 D:It is a ghastly, ghostly form. 
 
@@ -1068,11 +1450,17 @@ W:3:1:2000:12
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It's a large pile of yellow flesh. 
 
@@ -1083,9 +1471,13 @@ W:4:1:770:6
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:1d3
-F:RAND_50 | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:68:Raven
@@ -1096,8 +1488,13 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:Larger than a crow, and pitch black. 
 
 N:69:Giant white louse
@@ -1107,8 +1504,12 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is six inches long. 
 
@@ -1120,9 +1521,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:HURT:1d3
-F:RAND_50 | DROP_SKELETON |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:71:Black naga
@@ -1132,10 +1537,14 @@ W:3:1:1700:20
 E:0:0:0:0:1:0
 O:0:75:20:5
 B:CRUSH:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
 D:A large black serpent's body with a female torso. 
 
 N:72:Spotted mushroom patch
@@ -1145,10 +1554,15 @@ W:3:1:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:2d4
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:73:Silver jelly
@@ -1159,11 +1573,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_LITE:1d3
 B:TOUCH:EAT_LITE:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND |
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It is a large pile of silver flesh that sucks all light from its 
 D:surroundings. 
@@ -1176,11 +1596,15 @@ E:1:1:1:2:1:1
 O:0:50:0:40
 B:HIT:HURT:1d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A short little guy, in bedraggled clothes. He appears to be looking 
 D:for a good tavern. 
 
@@ -1191,9 +1615,13 @@ W:3:1:800:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is about two feet long and has sharp pincers. 
 
 N:76:Yellow mold
@@ -1203,10 +1631,14 @@ W:3:1:30:9
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 N:77:Metallic red centipede
@@ -1216,9 +1648,13 @@ W:5:1:800:10
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:2d3
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:78:Yellow worm mass
@@ -1228,10 +1664,16 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:LOSE_DEX:1d3
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1242,12 +1684,19 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | INVISIBLE | 
-F:ANIMAL | 
-F:IM_POIS | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:INVISIBLE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of poisonous worms. 
 
@@ -1258,9 +1707,13 @@ W:3:1:500:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:LOSE_STR:1d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+S:1_IN_11
 S:DRAIN_MANA
 D:A disembodied eye, crackling with energy. 
 
@@ -1271,8 +1724,14 @@ W:4:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:BLIND
-F:EMPTY_MIND | CAN_FLY | NONLIVING | SUSCEP_ELEC | 
-F:BASEANGBAND | HAS_LITE | RAND_50 | RAND_25 | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:NONLIVING
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:SUSCEP_ELEC
 D:A fast-moving bright light, apparently totally random in its movement.
 
 N:82:Cave lizard
@@ -1282,8 +1741,11 @@ W:4:1:100:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
-F:ANIMAL | CAN_SWIM | DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
 D:It is an armoured lizard with a powerful bite. 
 
 N:83:Novice ranger
@@ -1294,13 +1756,20 @@ E:1:1:1:2:1:1
 O:25:45:25:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:84:Blue jelly
@@ -1310,10 +1779,18 @@ W:4:1:2000:14
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:COLD:1d6
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
 D:It's a large pile of pulsing blue flesh. 
 
 N:85:Creeping copper coins
@@ -1324,10 +1801,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:TOUCH:POISON:2d4
-F:ONLY_GOLD | DROP_1D2 | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | CHAR_MULTI | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of copper coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1338,8 +1822,9 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d3
-F:RAND_25 | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a very vicious rodent. 
 
@@ -1350,11 +1835,21 @@ W:4:1:900:15
 E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:Immature Orclings, running wild and screaming all the time. 
 
 N:88:Swordfish
@@ -1365,8 +1860,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fish with a swordlike "beak". 
 
 N:89:Blue worm mass
@@ -1376,11 +1874,19 @@ W:4:1:40:5
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | COLD_BLOOD | 
-F:ANIMAL | IM_COLD | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:COLD_BLOOD
+F:HURT_LITE
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1392,8 +1898,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
 B:CRUSH:HURT:1d8
-F:RAND_25 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | WILD_TOO | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:91:Skeleton kobold
@@ -1403,9 +1916,18 @@ W:5:1:800:12
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a small animated kobold skeleton. 
 
 N:92:Ewok
@@ -1416,9 +1938,15 @@ E:1:1:1:2:1:1
 O:50:0:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | FRIENDS | DROP_CORPSE |
-F:WILD_TOO | WILD_WOOD | 
-F:MORTAL | JOKEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:JOKEANGBAND
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_8
 S:ARROW_1
 D:A cute little bear, full of merchandising potential. 
@@ -1430,13 +1958,22 @@ W:6:2:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:94:Green naga
@@ -1447,10 +1984,18 @@ E:0:0:0:0:1:0
 O:0:25:0:65
 B:CRUSH:HURT:1d8
 B:SPIT:ACID:2d6
-F:FEMALE | 
-F:RAND_25 | TAKE_ITEM | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:EVIL | IM_ACID | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large green serpent with a female torso. Her green skin glistens with 
 D:acid. 
 
@@ -1462,7 +2007,10 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:3d1
 B:BITE:HURT:3d1
-F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25 | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:RAND_25
+F:WEIRD_MIND
 D:Yech! The disgusting thing only wants your blood! 
 
 N:96:Barracuda
@@ -1473,8 +2021,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A predatory fish with razor-sharp teeth. 
 
 N:97:Novice paladin
@@ -1485,29 +2036,23 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:An adventurer both devoutly religious and skilful in combat.  
 D:He seems to consider you an agent of the devil. 
 
-N:98:Zog
-G:h:b
-I:110:13d9:20:20:20
-W:5:1:600:25
-E:0:1:0:2:1:0
-O:50:0:25:20
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-B:DROOL:*
-F:EVIL | OPEN_DOOR | BASH_DOOR | DROP_90 | DROP_SKELETON | 
-F:MORTAL | ZANGBAND
-D:Drooling, insectoid aliens with disgusting habits. 
-
 N:99:Blue ooze
 G:j:b
 I:110:3d4:8:16:80
@@ -1515,10 +2060,18 @@ W:5:1:300:7
 E:0:0:0:0:0:0
 O:45:20:20:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | DROP_60 | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | SUSCEP_FIRE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
 D:It's blue and it's oozing. 
 
 N:100:Green glutton ghost
@@ -1528,10 +2081,19 @@ W:5:1:0:15
 E:0:0:0:0:0:0
 O:30:30:30:5
 B:TOUCH:EAT_FOOD:1d1
-F:RAND_50 | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:UNDEAD
 D:It is a very ugly green ghost with a voracious appetite. 
 
 N:101:Green jelly
@@ -1541,10 +2103,16 @@ W:5:1:2500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:1d2
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_ACID | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of pulsing green flesh. 
 
 N:102:Large kobold
@@ -1554,10 +2122,15 @@ W:5:1:1000:25
 E:1:1:1:2:1:1
 O:0:90:0:5
 B:HIT:HURT:1d10
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
 D:It a man-sized figure with the all too recognisable face of a kobold. 
 
 N:103:Grey icky thing
@@ -1567,8 +2140,10 @@ W:5:1:500:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d5
-F:RAND_50 | CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:RAND_50
 D:It is a smallish, slimy, icky, nasty creature. 
 
 N:104:Disenchanter eye
@@ -1578,10 +2153,15 @@ W:5:2:500:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:UN_BONUS
-F:ATTR_MULTI | ATTR_ANY | RES_DISE | DROP_CORPSE | 
-F:NEVER_MOVE | CAN_FLY | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
-S:1_IN_9 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+F:RES_DISE
+S:1_IN_9
 S:DRAIN_MANA
 D:A disembodied eye, crackling with magic. 
 
@@ -1592,11 +2172,19 @@ W:5:1:40:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:FIRE:1d6
-F:RAND_50 | RAND_25 | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_COLD
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1607,8 +2195,16 @@ W:5:1:200:15
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d4
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | BASH_DOOR | 
-F:ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It has a copper head and sharp venomous fangs. 
 
 N:107:Death sword
@@ -1621,10 +2217,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:NEVER_MOVE | NONLIVING | NO_FEAR | SUSCEP_ACID |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | EVIL | IM_COLD | IM_FIRE | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_ACID
 D:A bloodthirsty blade lurking for prey. Beware! 
 
 N:108:Purple mushroom patch
@@ -1636,9 +2247,14 @@ O:0:0:0:0
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yuk!  It doesn't look so tasty. 
 
 N:109:Novice priest
@@ -1648,13 +2264,22 @@ W:6:2:1500:6
 E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:1d5
-F:MALE | GOOD |
-F:FORCE_SLEEP |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:110:Novice warrior
@@ -1665,39 +2290,18 @@ E:1:1:1:2:1:1
 O:0:95:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
-N:111:Nibelung
-G:h:D
-I:110:8d4:20:12:5
-W:6:1:900:6
-E:1:1:1:2:1:1
-O:90:0:0:5
-B:HIT:HURT:1d6
-B:TOUCH:EAT_GOLD
-F:MALE | 
-F:FRIENDS | DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | RES_DISE | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:Night dwarfs collecting riches. 
-
-N:112:The disembodied hand that strangled people
-G:z:g
-I:130:7d8:30:15:20
-W:6:2:300:20
-E:0:0:0:1:0:0
-O:0:0:0:0
-B:CRUSH:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_POIS | CAN_FLY | UNIQUE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-D:Even today, nobody knows where it lurks... 
-
 N:113:Brown mold
 G:m:u
 I:110:15d8:2:12:99
@@ -1705,10 +2309,15 @@ W:6:1:50:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange brown growth on the dungeon floor. 
 
 N:114:Giant brown bat
@@ -1718,26 +2327,17 @@ W:6:1:600:10
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | DROP_CORPSE | AI_ANNOY
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It screeches as it attacks. 
 
-N:115:Rat-thing
-G:r:R
-I:120:9d9:12:20:20
-W:6:1:1000:10
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:3d2
-B:BITE:HURT:3d1
-B:BITE:HURT:3d2
-F:EVIL | ANIMAL | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-S:1_IN_9
-S:SCARE | CONF
-D:A ratlike creature with a humanlike face. 
-
 N:116:Novice rogue
 G:p:b
 I:110:8d4:20:12:5
@@ -1746,10 +2346,17 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | FRIENDS | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:117:Creeping silver coins
@@ -1760,9 +2367,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:TOUCH:POISON:2d6
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | SUSCEP_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of silver coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1773,11 +2389,19 @@ W:6:1:1600:15
 E:1:1:1:2:1:1
 O:20:50:5:15
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
 D:goblin. 
 
@@ -1788,8 +2412,16 @@ W:6:1:200:20
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d5
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is recognised by the hard-scaled end of its body that is often rattled 
 D:to frighten its prey. 
 
@@ -1801,9 +2433,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:ACID:2d4
 B:BITE:ACID:2d6
-F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM |  WILD_TOO |
-F:DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:WILD_TOO
 S:1_IN_10
 S:BR_ACID
 D:It is slowly making its way towards you, eating everything in 
@@ -1816,9 +2453,13 @@ W:7:1:200:16
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:2d4
-F:RAND_50 | WILD_ONLY | WILD_SHORE | WILD_SWAMP |
-F:BASH_DOOR | DROP_CORPSE
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_ONLY
+F:WILD_SHORE
 D:It looks poisonous. 
 
 N:122:Dark elf
@@ -1829,13 +2470,20 @@ E:1:1:1:2:1:1
 O:20:20:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:CONF | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+S:1_IN_10
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:An elven figure with jet black skin and white hair, his eyes are large and 
 D:twisted with evil. 
 
@@ -1847,9 +2495,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d2
 B:HIT:HURT:1d2
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is an animated kobold corpse. Flesh falls off in large chunks as it 
 D:shambles forward. 
 
@@ -1862,12 +2519,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:POISON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
 F:RAND_25
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | 
-F:NO_CONF | NO_SLEEP | HURT_LITE | BASEANGBAND | NO_CUT
+F:UNDEAD
 S:1_IN_10
-S:CAUSE_1 | S_UNDEAD
+S:CAUSE_1
+S:S_UNDEAD
 D:A frightening skeletal figure in a black robe. 
 
 N:125:Rotting corpse
@@ -1878,9 +2545,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:POISON:1d3
 B:CLAW:POISON:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | EMPTY_MIND | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:Corpses awakened from their sleep by dark sorcery. 
 
 N:126:Cave orc
@@ -1890,11 +2567,18 @@ W:7:1:1900:20
 E:1:1:1:2:1:1
 O:20:70:0:0
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is often found in huge numbers in deep caves.
 
 N:127:Wood spider
@@ -1905,10 +2589,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:POISON:1d4
-F:FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_WOOD | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:It scuttles towards you. 
 
 N:128:Manes
@@ -1918,9 +2608,13 @@ W:7:2:300:16
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is a minor but aggressive demon. 
 
 N:129:Bloodshot eye
@@ -1930,9 +2624,13 @@ W:7:3:550:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:BLIND:2d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
 S:DRAIN_MANA
 D:A disembodied eye, bloodshot and nasty. 
 
@@ -1944,10 +2642,17 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:1d10
 B:BITE:LOSE_STR:1d4
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_60 | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large red snake with a woman's torso. 
 
 N:131:Red jelly
@@ -1957,10 +2662,15 @@ W:7:1:2500:26
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:1d5
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:HURT_LITE |  CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pulsating mound of red flesh. 
 
 N:132:Green icky thing
@@ -1970,9 +2680,11 @@ W:7:2:500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:2d5
-F:RAND_50 |  CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | 
-F:IM_ACID | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_ACID
+F:RAND_50
 D:It is a smallish, slimy, icky, acidic creature. 
 
 N:133:Lost soul
@@ -1983,12 +2695,23 @@ E:0:0:0:0:0:0
 O:60:0:25:0
 B:HIT:HURT:2d2
 B:TOUCH:LOSE_WIS
-F:RAND_50 | DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is almost insubstantial. 
 
 N:134:Night lizard
@@ -1999,8 +2722,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_SWIM | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
 D:It is a black lizard with overlapping scales and a powerful jaw. 
 
 N:135:Mughash, the Kobold Lord
@@ -2012,13 +2739,23 @@ O:0:100:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
-F:UNIQUE | MALE | CAN_SPEAK
-F:FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:Strong and powerful, for a kobold. 
 
 N:136:Skeleton orc
@@ -2028,10 +2765,19 @@ W:8:1:1700:26
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d5
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an animated orc skeleton.
 
 N:137:Wormtongue, Agent of Saruman
@@ -2044,46 +2790,29 @@ B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
-D:He's been spying for Saruman. He is a snivelling wretch with no morals. 
-
-N:138:Robin Hood, the Outlaw
-G:p:G
-I:120:16d12:20:30:20
-W:10:2:1600:150
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:HIT:HURT:1d5
-B:HIT:HURT:1d5
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | ZANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
 S:1_IN_5
-S:ARROW_2 | HEAL | TRAPS
-D:The legendary archer steals from the rich (you qualify). 
-
-N:139:Nurgling
-G:u:o
-I:110:9d8:20:32:30
-W:8:2:800:19
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BITE:DISEASE:1d8
-F:FRIENDS | FRIEND |
-F:OPEN_DOOR | BASH_DOOR | IM_POIS |
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | ZANGBAND
-D:It is a minor demon servitor of Nurgle. It looks like a hairless 
-D:teddy bear, with twisted eyes and rotting, ghoulish skin. 
+S:BA_POIS
+S:BO_COLD
+S:HEAL
+S:SLOW
+D:He's been spying for Saruman. He is a snivelling wretch with no morals. 
 
 N:140:Lagduf, the Snaga
 G:o:y
@@ -2095,10 +2824,23 @@ B:HIT:HURT:1d11
 B:HIT:HURT:1d11
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | MALE | EVIL | ORC | FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | SPECIAL_GENE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A captain of a regiment of weaker orcs, Lagduf keeps his troop in order 
 D:with displays of excessive violence. 
 
@@ -2109,10 +2851,13 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:It is a strange small humanoid. 
 
 N:142:Novice ranger
@@ -2123,12 +2868,19 @@ E:1:1:1:2:1:1
 O:0:80:0:15
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:143:Giant salamander
@@ -2138,11 +2890,15 @@ W:8:1:600:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_25 | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_9 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_9
 S:BR_FIRE
 D:A large black and yellow lizard. You'd better run away! 
 
@@ -2153,22 +2909,16 @@ W:8:2:0:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:TERRIFY:1d4
-F:PASS_WALL | NO_CONF | NO_SLEEP | NONLIVING | IM_ACID | CAN_FLY | JOKEANGBAND | NO_CUT
+F:CAN_FLY
+F:IM_ACID
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A black hole in the fabric of reality. 
 
-N:145:Carnivorous flying monkey
-G:H:R
-I:110:20d8:30:20:20
-W:8:2:800:30
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:1d8
-B:CLAW:HURT:1d8
-B:BITE:HURT:5d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:DROP_CORPSE | MORTAL | ZANGBAND | HAS_LITE
-D:It looks fantastic, yet frightening. 
-
 N:146:Green mold
 G:m:g
 I:110:21d8:2:14:75
@@ -2176,10 +2926,16 @@ W:8:1:40:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 N:147:Novice paladin
@@ -2190,13 +2946,21 @@ E:1:1:1:2:1:1
 O:30:55:10:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:He thinks you are an agent of the devil. 
 
 N:148:Lemure
@@ -2206,9 +2970,13 @@ W:8:3:1000:16
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is the larval form of a major demon. 
 
 N:149:Hill orc
@@ -2218,11 +2986,18 @@ W:8:1:2000:25
 E:1:1:1:2:1:1
 O:10:70:10:0
 B:HIT:HURT:1d10
-F:MALE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is a hardy well-weathered survivor. 
 
 N:150:Bandit
@@ -2233,10 +3008,18 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_1D2 | WILD_TOO | WILD_WOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
+F:WILD_WOOD
 D:He is after your possessions! 
 
 N:151:Hunting hawk
@@ -2248,8 +3031,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:ANIMAL | NO_FEAR | CAN_FLY | WILD_WOOD | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:NO_FEAR
+F:WILD_TOO
+F:WILD_WOOD
 D:Trained to hunt and kill without fear. 
 
 N:152:Phantom warrior
@@ -2260,25 +3049,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:PASS_WALL | NO_SLEEP | FRIENDS | COLD_BLOOD | NONLIVING |
-F:NO_FEAR | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FRIENDS
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
 D:Spectral creatures that are half real, half illusion. 
 
-N:153:Gremlin
-G:u:u
-I:110:5d5:30:30:20
-W:8:3:500:6
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:EAT_FOOD:1d2
-B:CLAW:EAT_FOOD:1d2
-B:BITE:EAT_FOOD:1d3
-F:IM_POIS | HURT_LITE | EVIL | DEMON | OPEN_DOOR | 
-F:TAKE_ITEM | CAN_SWIM | 
-F:MORTAL | ZANGBAND
-S:MULTIPLY
-D:Don't feed them after midnight! 
-
 N:154:Yeti
 G:Y:w
 I:110:11d9:20:24:10
@@ -2288,9 +3069,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A large white figure covered in shaggy fur. 
 
 N:155:Bloodshot icky thing
@@ -2301,10 +3088,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d4
 B:CRAWL:ACID:2d4
-F:RAND_50 | 
-F:EMPTY_MIND |  CAN_SWIM | DROP_CORPSE | 
-F:IM_POIS | BASEANGBAND
-S:1_IN_11 | 
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:RAND_50
+S:1_IN_11
 S:DRAIN_MANA
 D:It is a strange, slimy, icky creature. 
 
@@ -2315,9 +3104,10 @@ W:9:1:250:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d4
-F:RAND_25 | 
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:IM_POIS
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a rodent of unusual size. 
 
@@ -2330,25 +3120,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:HURT:1d3
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:RAND_25 | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A woman's face on the body of a vicious black bird. 
 
-N:158:Skaven
-G:r:G
-I:110:11d8:15:25:20
-W:9:1:600:20
-E:1:1:1:2:1:1
-O:35:35:20:0
-B:HIT:HURT:1d4
-B:HIT:HURT:1d4
-F:EVIL | FRIENDS | DROP_60 | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | MALE | WILD_TOO | WILD_WASTE | WILD_SWAMP | 
-F:MORTAL | ZANGBAND
-D:A mutated rat-creature from the great waste, it is vaguely 
-D:humanoid in appearance and walks on its hind legs. This race 
-D:serves chaos fervently and is greatly feared by others. 
-
 N:159:The wounded bear
 G:q:r
 I:110:11d10:10:35:10
@@ -2358,9 +3140,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d11
-F:BASH_DOOR | FORCE_MAXHP | FORCE_SLEEP | UNIQUE | DROP_CORPSE | 
-F:ANIMAL | WILD_ONLY | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WOOD
 D:A wounded bear, who has occasionally attacked humans. 
 
 N:160:Cave bear
@@ -2372,9 +3162,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:BASH_DOOR | FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ANIMAL | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large bear appears to have made its home in this cave.  It is hungry, 
 D:and you are trespassing in its territory. 
 
@@ -2386,8 +3182,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | KILL_WALL | KILL_ITEM | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:KILL_ITEM
+F:KILL_WALL
+F:MORTAL
+F:WEIRD_MIND
 D:Despite its unimpressive size, this mole creature has fangs powerful 
 D:enough to bore through solid rock. 
 
@@ -2399,12 +3200,25 @@ E:1:1:1:2:1:1
 O:30:40:30:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_TOO | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:CONF | BLIND | HOLD | SLOW | MIND_BLAST | S_MONSTER | BLINK
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_MONSTER
 D:A master of the mental arts, able to damage or dominate the 
 D:minds of others. 
 
@@ -2417,11 +3231,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | HAS_EGG | IMPRESED | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ELEC
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ELEC
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale blue. 
@@ -2435,12 +3261,24 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | ATTR_MULTI
-F:EVIL | DRAGON | IM_COLD | SUSCEP_FIRE | HAS_EGG | IMPRESED | BASEANGBAND
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_COLD
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+S:1_IN_12
 S:BR_COLD
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale white. 
@@ -2454,11 +3292,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_POIS
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a sickly green. 
@@ -2472,11 +3321,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ACID
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ACID
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull black. 
@@ -2490,12 +3350,24 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_FIRE
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_COLD
+S:1_IN_11
 S:BR_FIRE
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale red. 
@@ -2508,8 +3380,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is large and has venomous mandibles. 
 
 N:169:Brodda, the Easterling
@@ -2522,11 +3399,21 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
-F:UNIQUE | MALE | EVIL
-F:FORCE_MAXHP | CAN_SPEAK | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_TOO
 D:A nasty piece of work, Brodda picks on defenceless women and children. 
 
 N:170:Bloodfang, the Wolf
@@ -2537,9 +3424,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d12
 B:BITE:HURT:1d12
-F:BASH_DOOR | WILD_ONLY | WILD_GRASS | WILD_WOOD | DROP_CORPSE |
-F:ANIMAL | UNIQUE | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It has been terrorising the nearby villages. 
 
 N:171:King cobra
@@ -2550,8 +3443,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:SPIT:BLIND:1d2
 B:BITE:POISON:3d4
-F:RAND_50 | WILD_TOO | WILD_SWAMP | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large snake with a hooded face. 
 
 N:172:Eagle
@@ -2563,8 +3465,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_FLY | WILD_ONLY | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | HAS_EGG
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WASTE
+F:WILD_WOOD
 D:A magnificent huge predatory bird. 
 
 N:173:War bear
@@ -2576,9 +3485,13 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
 D:Bears with tusks, trained to kill. 
 
 N:174:Killer bee
@@ -2589,8 +3502,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:STING:POISON:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | FRIENDS | CAN_FLY | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is poisonous and aggressive. 
 
 N:175:Giant spider
@@ -2603,9 +3520,14 @@ B:BITE:HURT:1d10
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a vast spider whose bulbous body is bloated with poison. 
 
 N:176:Giant white tick
@@ -2615,33 +3537,14 @@ W:10:2:200:27
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
-N:177:The Borshin
-G:g:w
-I:110:12d20:40:30:0
-W:10:2:600:45
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:2d12
-B:CRUSH:HURT:2d15
-B:TOUCH:TERRIFY
-F:BASH_DOOR | UNIQUE | FORCE_MAXHP | NO_CONF
-F:IM_POIS | IM_COLD | NO_FEAR 
-F:MORTAL | CTHANGBAND | NO_CUT
-D:Pallid and twisted, this creature hates the very sight of you. 
-D:"It looked like something that had started out to be a man but had never 
-D:quite made it. It had been stepped on, twisted, had holes poked into the 
-D:sickly dough of its head-bulge. Bones showed through the transparent flesh 
-D:of its torso and its short legs were as thick as trees, terminating in 
-D:disk-shaped pads from which dozens of long toes hung like roots or worms. 
-D:its arms were longer than its entire body. it was a crushed slug, a thing 
-D:that had been frozen and thawed before it was fully baked. It was - 
-D:'It is the Borshin', said the Lord of Bats." 
-
 N:178:Dark elven mage
 G:h:r
 I:120:7d10:20:16:20
@@ -2650,27 +3553,26 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | MISSILE | DARKNESS | BA_POIS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven figure, dressed all in black, hurling spells at you. 
 
-N:179:Kamikaze yeek
-G:y:r
-I:113:4d8:18:18:10
-W:10:1:800:10
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:EXPLODE:HURT:15d2
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | ZANGBAND
-D:The evil wizard Bruce has trained them to be living weapons. 
-
 N:180:Orfax, Son of Boldor
 G:y:B
 I:120:14d10:18:20:10
@@ -2681,35 +3583,34 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d9
 B:INSULT:*
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLINK | TELE_TO | SLOW | CONF | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_4
+S:BLINK
+S:CONF
+S:HEAL
+S:SLOW
 S:S_MONSTER
+S:TELE_TO
 D:He's just like his daddy!  He knows mighty spells, but fortunately he is a 
 D:yeek. 
 
-N:181:Servant of Glaaki
-G:z:G
-I:110:9d9:20:20:20
-W:10:1:600:25
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:1d8
-B:CLAW:DISEASE:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS | HURT_LITE |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | CTHANGBAND | NO_CUT
-S:1_IN_12
-S:CAUSE_1 | SCARE
-D:"...the hand of a corpse -- bloodless and skeletal, and with 
-D:impossibly long, cracked nails." 
-
 N:182:Dark elven warrior
 G:h:u
 I:110:10d11:20:16:20
@@ -2718,30 +3619,19 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
 S:1_IN_12
 S:MISSILE
 D:A dark elven figure in armour, ready with his sword. 
 
-N:183:Sand-dweller
-G:u:y
-I:110:9d9:20:20:20
-W:10:1:600:30
-E:1:1:1:2:1:1
-O:20:50:20:5
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-F:FRIENDS | WILD_TOO | WILD_WASTE | DROP_SKELETON | 
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE | EVIL | DROP_60 | DROP_90 | 
-F:MALE
-F:MORTAL | CTHANGBAND
-D:"Rough-skinned, large-eyed, large-eared, with a horrible, 
-D:distorted resemblance to the koala bear facially, though 
-D:his body had an appearance of emaciation." 
-
 N:184:Clear mushroom patch
 G:,:B
 I:120:1d1:4:1:0
@@ -2749,10 +3639,17 @@ W:10:2:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d1
-F:ATTR_CLEAR | 
-F:NEVER_MOVE | INVISIBLE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:Yum! It smells quite tasty.  If you could only see it...
 
@@ -2763,11 +3660,18 @@ W:10:2:60:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d1
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_5 | ARROW_1
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_5
+S:ARROW_1
+S:MULTIPLY
 D:What looks like the remains of a quiver dropped by a past adventurer 
 D:has become overgrown with a strange mold intent on using the contents 
 D:of the quiver to grab prey. 
@@ -2782,13 +3686,25 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | WILD_TOO |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:He is a cunning and devious orc with a chaotic nature. 
 
 N:187:Giant tan bat
@@ -2800,9 +3716,16 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat, the beating of whose wings produces a strangely unnerving noise. 
 
 N:188:Owlbear
@@ -2814,23 +3737,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:CRUSH:HURT:1d10
-F:EVIL | ANIMAL | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
 D:A bizarre bear-creature with the claws and the face of an owl. 
 
-N:189:Blue horror
-G:u:B
-I:110:14d9:20:35:20
-W:10:3:1200:25
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:TERRIFY:1d8
-B:CLAW:TERRIFY:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | NO_CONF | ZANGBAND
-D:An ugly screaming little demon servant of Tzeentch. 
-
 N:190:Hairy mold
 G:m:o
 I:110:15d8:2:15:70
@@ -2838,10 +3752,15 @@ W:10:1:50:32
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange hairy growth on the dungeon floor. 
 
 N:191:Grizzly bear
@@ -2854,9 +3773,13 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d12
 B:CRUSH:HURT:1d10
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | BASH_DOOR | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A huge, beastly bear, more savage than most of its kind. 
 
 N:192:Disenchanter mold
@@ -2866,11 +3789,18 @@ W:10:1:40:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:UN_BONUS:1d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | RES_DISE |
-F:IM_POIS | ATTR_MULTI | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:ATTR_MULTI
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_DISE
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:It is a strange glowing growth on the dungeon floor. 
 
@@ -2883,11 +3813,22 @@ O:50:50:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:DROP_60 | BASH_DOOR | HAS_EGG | 
-F:EVIL | DRAGON | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_11 | 
-S:CONF | SCARE | BR_LITE | BR_DARK
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+S:1_IN_11
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
 D:A small relative of the dragon that inhabits dark caves. 
 
 N:194:Tengu
@@ -2897,10 +3838,19 @@ W:10:1:600:40
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | RES_TELE | CAN_FLY | BASEANGBAND
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TPORT
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_3
+S:BLINK
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:It is a fast-moving demon that blinks quickly in and out of existence; no 
 D:other demon matches its teleporting mastery. 
 
@@ -2912,9 +3862,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_90
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of gold coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -2925,10 +3882,16 @@ W:10:1:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:RAND_25 | FRIENDS | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:It howls and snaps at you. 
 
 N:197:Giant fruit fly
@@ -2938,8 +3901,12 @@ W:10:3:100:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:A fast-breeding, annoying pest. 
 
@@ -2951,8 +3918,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A large black cat, stalking you with intent. It thinks you're its next 
 D:meal. 
 
@@ -2964,11 +3937,15 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_ITEM
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:He is eyeing your backpack. 
 
 N:200:Hobbes the Tiger
@@ -2980,31 +3957,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
 B:BITE:HURT:1d5
-F:BASH_DOOR | UNIQUE | FORCE_MAXHP |
-F:ANIMAL | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:MORTAL | JOKEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:UNIQUE
 D:Fast-moving, with a taste for tuna sandwiches. 
 
-N:201:Shadow Creature of Fiona
-G:h:s
-I:110:11d8:12:12:16
-W:10:2:1000:35
-E:1:1:1:2:1:1
-O:20:30:50:0
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-F:BASH_DOOR | OPEN_DOOR | FRIENDS | DROP_60 | IM_POIS | NO_SLEEP | NO_CONF
-F:MALE | DROP_SKELETON | ZANGBAND
-D:"There was something unusual about their appearance... For one thing, 
-D:all had uniformly bloodshot eyes. Very, very bloodshot eyes. With them, 
-D:though, the condition seemed normal. For another, all had an extra joint 
-D:to each finger and thumb, and sharp, forward-curving spurs on the backs 
-D:of their hands. All of them had prominent jaws and forty-four teeth, 
-D:most of them longer than human teeth, and several looking to be much 
-D:sharper. Their flesh was grayish and hard and shiny. There were 
-D:undoubtedly other differences also, but those were sufficient to prove 
-D:a point of some sort." 
-
 N:202:Undead mass
 G:j:u
 I:110:8d8:70:12:5
@@ -3013,27 +3976,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:DISEASE:1d6
 B:TOUCH:LOSE_CON:1d6
-F:UNDEAD | EMPTY_MIND | NO_CONF | NO_SLEEP | IM_POIS | IM_COLD | NO_FEAR |
-F:HURT_LITE | COLD_BLOOD | EVIL | NEVER_MOVE | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:MULTIPLY
 D:A sickening mound of decaying flesh, bones, hands and so on. It seems to 
 D:be growing. 
 
-N:203:Chaos shapechanger
-G:H:v
-I:110:20d9:10:14:12
-W:11:2:0:38
-E:1:1:1:2:1:1
-O:20:50:20:6
-B:HIT:HURT:1d5
-B:HIT:HURT:1d5
-B:HIT:CONFUSE:1d3
-F:DROP_60 | EVIL | SHAPECHANGER | ATTR_MULTI | ATTR_ANY
-F:MORTAL | ZANGBAND
-S:1_IN_5
-S:BO_FIRE | BO_COLD | CONF
-D:A vaguely humanoid form constantly changing its appearance. 
-
 N:204:Baby multi-hued dragon
 G:d:v
 I:110:13d10:20:30:70
@@ -3043,33 +4001,35 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:ATTR_MULTI | 
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HAS_EGG | IMPRESED | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales shimmering with a hint of colour. 
 
-N:205:Vorpal bunny
-G:r:w
-I:120:10d10:40:40:0
-W:11:3:600:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:6d1
-B:BITE:HURT:7d1
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | MORTAL | ZANGBAND
-S:1_IN_8
-S:BLINK
-D:It looks very cute, except for the razor sharp teeth. It moans 
-D:ominously as it jumps at your throat! 
-
 N:206:Old Man Willow
 G:#:s
 I:110:32d30:20:20:20
@@ -3079,12 +4039,26 @@ O:0:50:50:0
 B:TOUCH:PARALYZE:1d14
 B:TOUCH:PARALYZE:1d14
 B:CRUSH:HURT:2d12
-F:ANIMAL | NEVER_MOVE | COLD_BLOOD | DROP_RANDART
-F:EMPTY_MIND | UNIQUE | FORCE_MAXHP | FORCE_SLEEP |
-F:RES_WATE | IM_POIS | IM_ACID | SUSCEP_FIRE | SPECIAL_GENE | 
-F:DROP_1D2 | DROP_GOOD | ONLY_ITEM | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
-S:TELE_TO | HOLD | 
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:ONLY_ITEM
+F:RES_WATE
+F:SPECIAL_GENE
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_10
+S:HOLD
+S:TELE_TO
 D:The ancient grey willow tree, ruler of the Old Forest. He despises 
 D:trespassers in his territory.  "...a huge willow-tree, old and hoary. 
 D:Enormous it looked, its sprawling branches going up like racing arms 
@@ -3099,8 +4073,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d5
 B:BITE:HURT:2d5
-F:AQUATIC | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
 D:A truly strange hybrid of a horse and a fish. 
 
 N:208:Zombified orc
@@ -3112,10 +4089,19 @@ O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is a shambling orcish corpse leaving behind a trail of flesh. 
 
 N:209:Hippogryph
@@ -3126,8 +4112,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:BITE:HURT:2d5
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_GRASS | 
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A strange hybrid of eagle and horse. It looks weird. 
 
 N:210:Black mamba
@@ -3137,10 +4129,18 @@ W:12:3:300:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:4d4
-F:RAND_50 | BASH_DOOR | CAN_SWIM | 
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | WILD_SWAMP | 
-F:ANIMAL | IM_POIS | DROP_SKELETON | DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It has glistening black skin, a sleek body, and highly venomous fangs. 
 
 N:211:White wolf
@@ -3151,11 +4151,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:FRIENDS | SUSCEP_FIRE |
-F:BASH_DOOR | WILD_TOO | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:SUSCEP_FIRE
+F:WILD_TOO
+F:WILD_WASTE
 D:A large and muscled wolf from the northern wastes. Its breath is cold and 
 D:icy and its fur coated in frost. 
 
@@ -3166,11 +4172,17 @@ W:12:3:2600:60
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:Yum! It looks quite tasty.  It is a pulsing mound of glowing flesh. 
 
@@ -3181,27 +4193,20 @@ W:12:4:200:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of dark worms, eating each other, the floor, 
 D:the air, you... 
 
-N:214:Abyss worm mass
-G:w:D
-I:100:5d8:10:15:3
-W:12:4:200:7
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRAWL:EXP_10
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | BASH_DOOR | EVIL | CAN_SWIM |
-F:ANIMAL | HURT_LITE | NO_FEAR | KILL_WALL | COLD_BLOOD | INVISIBLE | 
-F:MORTAL | ZANGBAND | NO_CUT
-S:MULTIPLY
-D:Even more disgusting dark worms, their essence that of unbeing. 
-
 N:215:Golfimbul, the Hill Orc Chief
 G:o:y
 I:110:26d10:20:60:20
@@ -3212,13 +4217,28 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | WILD_TOO | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK |
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:A leader of a band of raiding orcs, he picks on hobbits. 
 
 N:216:Swordsman
@@ -3229,29 +4249,17 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | WILD_TOO |
-F:DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A warrior of considerable skill. 
 
-N:217:Skaven shaman
-G:r:g
-I:110:10d8:20:15:20
-W:12:1:600:36
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:HIT:HURT:1d7
-B:HIT:HURT:1d7
-F:MALE | WILD_TOO | WILD_SWAMP | WILD_WASTE |
-F:FORCE_SLEEP | DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | ZANGBAND
-S:1_IN_8 | 
-S:BLINK | CAUSE_1 | MISSILE | CONF | SCARE
-D:The shaman of a skaven tribe gets his powers from a mystic 
-D:stone corrupted by chaos, called a Warp Stone. 
-
 N:218:Baby bronze dragon
 G:d:U
 I:110:10d10:20:30:70
@@ -3261,11 +4269,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_CONF
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull bronze. 
@@ -3279,12 +4298,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_SOUN
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale gold. 
@@ -3297,58 +4327,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:EXP_10
 B:GAZE:EXP_10
-F:NEVER_MOVE | EVIL | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:HOLD | TELE_TO 
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:HOLD
+S:TELE_TO
 D:A huge disembodied eye.  As you stare into the black nothingness of its pupil, 
 D:you feel your will and vitality draining away, and are unable to do anything 
 D:except approach it in horrified fascination. 
 
-N:221:Mine-dog
-G:C:u
-I:120:6d6:30:30:20
-W:12:4:500:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:EXPLODE:HURT:6d6
-F:RAND_50 | FRIENDS | BASH_DOOR | ANIMAL | 
-F:MORTAL | ZANGBAND
-D:An explosive charge has been attached to this poor animal, who 
-D:has been trained to search for its target and detonate. 
-
-N:222:Hellcat
-G:f:R
-I:120:9d8:20:30:30
-W:12:1:400:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d5
-B:CLAW:HURT:1d5
-B:BITE:HURT:1d8
-F:ANIMAL | WEIRD_MIND | FRIENDS | RAND_25 | IM_FIRE | EVIL | SUSCEP_COLD |
-F:MORTAL | ZANGBAND | HAS_LITE
-D:It is as large as a tiger, and its yellow eyes are pupilless. 
-
-N:223:Moon beast
-G:q:W
-I:120:9d10:30:30:20
-W:12:1:800:57
-E:0:1:0:2:1:0
-O:50:0:40:5
-B:CLAW:HURT:1d3
-B:CLAW:HURT:1d3
-B:BUTT:HURT:1d6
-F:DROP_1D2 | ONLY_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | ANIMAL | DROP_CORPSE
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:HEAL | BLIND | DARKNESS | CONF | CAUSE_2
-D:"Great greyish-white slippery things which could expand and 
-D:contract at will, and whose principle shape... was that of a 
-D:sort of toad without any eyes, but with a curious vibrating mass 
-D:of short pink tentacles on the end of its blunt, vague snout." 
-
 N:224:Master yeek
 G:y:g
 I:110:12d9:18:24:10
@@ -3356,14 +4348,22 @@ W:12:2:600:28
 E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d8
-F:FORCE_SLEEP | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | TPORT | BLIND | SLOW | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:SLOW
 S:S_MONSTER
+S:TPORT
 D:A small humanoid that radiates some power. 
 
 N:225:Priest
@@ -3374,13 +4374,21 @@ E:1:1:1:2:1:1
 O:0:20:80:0
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MALE | GOOD |
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:CAUSE_2
+S:HEAL
+S:SCARE
 S:S_MONSTER
 D:A robed man dedicated to his god. 
 
@@ -3392,13 +4400,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:HIT:HURT:1d9
 B:HIT:HURT:1d10
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_5
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:A dark elven figure, dressed all in black, chanting curses and waiting to 
 D:deliver your soul to hell. 
 
@@ -3409,10 +4429,20 @@ W:12:2:0:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:RAND_50 | RAND_25 | IM_ELEC | IM_POIS | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A whirlwind of sentient air. 
 
 N:228:Skeleton human
@@ -3422,9 +4452,18 @@ W:12:1:1500:38
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is an animated human skeleton. 
 
 N:229:Zombified human
@@ -3435,9 +4474,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a shambling human corpse dropping chunks of flesh behind it. 
 
 N:230:Tiger
@@ -3449,9 +4497,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:One of the largest of its species, a sleek orange and black shape creeps 
 D:towards you, ready to pounce. 
 
@@ -3463,12 +4517,23 @@ E:0:0:0:0:0:0
 O:45:15:25:0
 B:WAIL:TERRIFY
 B:TOUCH:LOSE_DEX:1d8
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | SCARE
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:UNDEAD
+S:1_IN_15
+S:SCARE
+S:TPORT
 D:A ghostly apparition that shrieks horribly. 
 
 N:232:Stegocentipede
@@ -3480,8 +4545,11 @@ O:0:0:0:0
 B:BITE:HURT:2d4
 B:BITE:HURT:2d4
 B:STING:HURT:2d4
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | DROP_SKELETON | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
 D:It is a vast armoured centipede with massive mandibles and a spiked tail. 
 
 N:233:Spotted jelly
@@ -3493,10 +4561,18 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:IM_ACID | IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange jelly thing, covered in discoloured blotches. 
 
 N:234:Drider
@@ -3508,12 +4584,19 @@ O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | 
-F:BASH_DOOR | DROP_SKELETON |
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:CONF | CAUSE_1 | DARKNESS | MISSILE | ARROW_2 
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+S:1_IN_8
+S:ARROW_2
+S:CAUSE_1
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven torso merged with the bloated form of a giant spider. 
 
 N:235:Mongbat
@@ -3525,9 +4608,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:POISON:1d8
-F:ANIMAL | EVIL | FRIENDS | CAN_FLY | FORCE_MAXHP |
-F:IM_COLD | IM_ELEC | IM_POIS | WEIRD_MIND | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:Devil-bats, notoriously difficult to kill. 
 
 N:236:Killer brown beetle
@@ -3537,8 +4628,12 @@ W:13:1:500:38
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a vicious insect with a tough carapace. 
 
 N:237:Boldor, King of the Yeeks
@@ -3550,16 +4645,33 @@ O:0:90:10:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d9
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_CORPSE | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
-S:HEAL | BLINK | TPORT | BLIND | SLOW | 
-S:S_KIN | S_MONSTER
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BLIND
+S:BLINK
+S:HEAL
+S:SLOW
+S:S_KIN
+S:S_MONSTER
+S:TPORT
 D:A great yeek, powerful in magic and sorcery, but a yeek all the same. 
 
 N:238:Ogre
@@ -3569,11 +4681,18 @@ W:13:2:2100:50
 E:1:1:1:2:1:1
 O:10:85:0:0
 B:HIT:HURT:2d8
-F:FRIENDS | 
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A hideous, smallish giant that is often found near or with orcs. 
 
 N:239:Creeping mithril coins
@@ -3584,9 +4703,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | IM_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of sentient mithril coins that doesn't like being 
 D:picked up. 
 
@@ -3597,12 +4725,26 @@ W:13:2:1500:50
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d2
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | TPORT | BLIND | HOLD | SLOW | CONF | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:HASTE
+S:HOLD
+S:SLOW
+S:TPORT
 D:A deceptive spell caster. 
 
 N:241:Druid
@@ -3613,31 +4755,30 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | WILD_TOO | WILD_WOOD |
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | BLIND | HOLD | SLOW | BO_FIRE | BO_ELEC | S_ANIMAL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:HOLD
+S:SLOW
+S:S_ANIMAL
 D:A priest devoted to Nature. 
 
-N:242:Pink horror
-G:u:R
-I:110:15d9:20:35:20
-W:13:3:1200:64
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:TERRIFY:1d8
-B:CLAW:TERRIFY:1d8
-B:BITE:CONFUSE:1d6
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | NO_CONF | ZANGBAND
-S:1_IN_8 | 
-S:CONF | SCARE
-D:An ugly screaming little demon servant of Tzeentch.
-
 N:243:Cloaker
 G:(:g
 I:130:7d7:20:40:0
@@ -3646,10 +4787,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE:5d5
 B:HIT:TERRIFY:5d5
-F:NEVER_MOVE | NO_FEAR |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | IM_COLD | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It resembles a normal cloak until some poor fool ventures too close! 
 
 N:244:Black orc
@@ -3660,11 +4811,19 @@ E:1:1:1:2:1:1
 O:10:50:20:15
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 S:1_IN_9
 S:ARROW_2
 D:He is a large orc with powerful arms and deep black skin. 
@@ -3678,10 +4837,19 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A fast moving highly acidic jelly thing, that is eating away the floor it 
 D:rests on. 
 
@@ -3692,9 +4860,14 @@ W:14:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | MORTAL | JOKEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:JOKEANGBAND
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Oh no! They are everywhere! 
 
@@ -3706,10 +4879,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:A strange creature that merges with the dungeon floor, trapping its 
 D:victims by enveloping them within its perfectly disguised form. 
 
@@ -3721,28 +4901,28 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE
 B:HIT:PARALYZE
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A mass of vegetation.  As you pass near it, it reaches out tendrils to 
 D:ensnare you.  You can just make out skeletons of its previous victims 
 D:deep within the thickets. 
 
-N:249:Vlasta
-G:R:B
-I:120:12d6:12:20:12
-W:14:3:1000:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:BLIND:1d10
-B:BITE:BLIND:1d10
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-D:This strange creature looks like a miniature tyrannosaur. It has 
-D:empty, pale eyes and a sharp beak, which it aims at your eyes 
-D:as it jumps at you! 
-
 N:250:Giant white dragon fly
 G:F:w
 I:110:3d8:12:20:50
@@ -3750,31 +4930,21 @@ W:14:2:150:60
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:COLD:1d6
-F:FORCE_SLEEP | WILD_TOO | WILD_WASTE |
-F:RAND_50 | CAN_FLY | SUSCEP_FIRE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_COLD
+F:MORTAL
+F:RAND_50
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
 D:It is a large fly that drips frost. 
 
-N:251:Snaga sapper
-G:o:U
-I:111:8d8:20:32:30
-W:14:1:80:15
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:1d8
-B:EXPLODE:HURT:20d2
-F:MALE | 
-F:WILD_TOO | SUSCEP_FIRE |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
-D:goblin. He is equipped with an explosive charge. 
-
 N:252:Blue icky thing
 G:i:b
 I:100:10d6:15:20:20
@@ -3785,13 +4955,19 @@ B:CRAWL:POISON:1d4
 B:CRAWL:EAT_FOOD
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:FORCE_SLEEP | 
-F:RAND_50 | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | IM_POIS | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_8 | 
-S:BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_POIS
+F:OPEN_DOOR
+F:RAND_50
+S:1_IN_8
+S:BLIND
+S:CONF
+S:MULTIPLY
+S:SCARE
 D:It is a strange, slimy, icky creature, with rudimentary intelligence, 
 D:but evil cunning. It hungers for food, and you look tasty. 
 
@@ -3802,25 +4978,20 @@ W:14:4:2600:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d4
-F:NEVER_MOVE | EVIL | CAN_SWIM |
-F:IM_POIS | EMPTY_MIND | NO_FEAR | BASEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_7 | 
-S:SCARE | CONF | BR_LITE
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:BR_LITE
+S:CONF
+S:MULTIPLY
+S:SCARE
 D:A chaotic mass of pulsating flesh, mouths and eyes. 
 
-N:254:Wolfhound of Flora
-G:C:s
-I:120:9d9:20:20:0
-W:14:2:1600:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:1d5
-B:BITE:HURT:1d5
-F:ANIMAL | NO_FEAR | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-D:Well-trained watchdogs, obedient to death. 
-
 N:255:Hill giant
 G:P:U
 I:110:30d15:20:45:50
@@ -3829,10 +5000,18 @@ E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:DROP_60 | WILD_TOO | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | MALE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A ten foot tall humanoid with powerful muscles. 
 
 N:256:Flesh golem
@@ -3843,10 +5022,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:EMPTY_MIND | BASH_DOOR | CAN_SWIM |
-F:IM_ELEC | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:A shambling humanoid monster with long scars. 
 
 N:257:Warg
@@ -3857,26 +5043,19 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:RAND_25 | BASH_DOOR | FRIENDS | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large wolf with eyes full of cunning. 
 
-N:258:Cheerful leprechaun
-G:h:G
-I:120:2d5:8:6:6
-W:14:2:800:23
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_FOOD
-F:DROP_60 | ONLY_GOLD | RAND_50 | OPEN_DOOR | MALE | 
-F:GOOD | MORTAL | ZANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK
-D:A merry little gnome. 
-
 N:259:Giant flea
 G:I:s
 I:120:1d2:6:7:10
@@ -3884,8 +5063,11 @@ W:14:3:90:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It makes you itch just to look at it. 
 
@@ -3899,13 +5081,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong orc guarding the pass of Cirith Ungol. He is mortally afraid of 
 D:spiders:  he was captured by Shelob once, but escaped when she forgot 
 D:completely about him.
@@ -3918,10 +5111,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue made out of hardened clay. 
 
 N:262:Black ogre
@@ -3932,29 +5133,20 @@ E:1:1:1:2:1:1
 O:0:70:0:15
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:RAND_25 | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A massive orc-like figure with black skin and powerful arms. 
 
-N:263:Dweller on the threshold
-G:Y:s
-I:110:30d8:30:30:20
-W:15:5:3000:50
-E:1:1:1:2:1:1
-O:45:0:40:10
-B:GAZE:PARALYZE:4d4
-B:GAZE:TERRIFY:3d3
-B:GAZE:CONFUSE:3d3
-F:NEVER_MOVE | DROP_60 | EVIL | DEMON | DROP_CORPSE | 
-F:IM_POIS | IM_COLD |IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:BO_ACID | S_MONSTER | SCARE | DRAIN_MANA
-D:A gorilla-shaped arcane guardian with an appetite for mages. 
-
 N:264:Half-orc
 G:o:s
 I:110:16d10:20:40:20
@@ -3963,10 +5155,18 @@ E:1:1:1:2:1:1
 O:30:30:30:5
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO |
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is a hideous deformed cross-breed of man and orc, combining man's 
 D:strength and cunning with orcish evil.  The traitorous wizard Saruman is 
 D:generally believed to be responsible for this abomination. 
@@ -3979,12 +5179,26 @@ E:0:0:0:0:1:0
 O:0:0:80:20
 B:STING:HURT:1d10
 B:BITE:HURT:1d10
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | IM_POIS | IM_COLD | RES_WATE |
-F:OPEN_DOOR | BASH_DOOR | EMPTY_MIND | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:RES_WATE
 S:1_IN_8
-S:HOLD | CONF | BO_COLD | HEAL | DARKNESS
+S:BO_COLD
+S:CONF
+S:DARKNESS
+S:HEAL
+S:HOLD
 D:A giant snake-like figure with a woman's torso, talented in magic. 
 
 N:266:Poison ivy
@@ -3995,10 +5209,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:POISON:2d2
 B:HIT:POISON:2d2
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 S:MULTIPLY
 D:A mass of vegetation.  It seems to be growing...  
 
@@ -4012,32 +5240,22 @@ B:SPORE:CONFUSE
 B:SPORE:CONFUSE
 B:SPORE:HALLU
 B:SPORE:HALLU
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | RES_TELE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | SLOW | SCARE | DARKNESS
+F:CAN_SWIM
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:STUPID
+S:1_IN_2
+S:BLINK
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:Yum!  It looks quite tasty. It seems to glow with an unusual light. 
 
-N:268:Plaguebearer of Nurgle
-G:z:o
-I:110:9d10:20:50:20
-W:15:2:2800:75
-E:1:1:1:2:1:1
-O:50:20:20:10
-B:CLAW:DISEASE:2d5
-B:CLAW:DISEASE:2d5
-B:BUTT:HURT:3d5
-F:FORCE_MAXHP | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | IM_COLD |
-F:EVIL | DEMON | UNDEAD | IM_POIS | NONLIVING | ZANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | S_ANT | CAUSE_2 | SLOW
-D:An unfortunate individual, who was killed by the incurable 
-D:disease known as Nurgle's Rot, and was transformed into a 
-D:rotting demon zombie. It has but one eye, and a single 
-D:pale horn in its forehead. 
-
 N:269:Guardian naga
 G:n:y
 I:110:24d11:20:65:120
@@ -4047,11 +5265,16 @@ O:0:0:80:20
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
 F:EVIL
-F:MORTAL | BASEANGBAND
+F:FEMALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
 D:A giant snake-like figure with a woman's torso. 
 
 N:270:Wererat
@@ -4063,13 +5286,21 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL
-F:MORTAL | BASEANGBAND
-S:1_IN_9 | 
-S:BLINK | CAUSE_2 | BO_COLD | BA_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_9
+S:BA_POIS
+S:BLINK
+S:BO_COLD
+S:CAUSE_2
+S:S_KIN
 D:A large rat with glowing red eyes, which can also assume human form. The wererat 
 D:is a disgusting creature, relishing in filth and disease. 
 
@@ -4082,11 +5313,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_LITE
 D:A brilliant canine form whose light hurts your eyes, even at this distance. 
 
@@ -4099,11 +5333,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | HURT_LITE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_DARK
 D:A hole in the air in the shape of a huge hound. No light falls upon its 
 D:form. 
@@ -4116,29 +5353,22 @@ E:0:0:0:0:1:0
 O:90:0:10:0
 B:BITE:POISON:1d3
 B:BITE:LOSE_STR:1d4
-F:UNDEAD | EVIL | IM_POIS | IM_COLD | WEIRD_MIND | NO_FEAR | CAN_FLY |
-F:NO_CONF | NO_SLEEP | DROP_60 | BASH_DOOR | FRIENDS | COLD_BLOOD | 
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
+F:WEIRD_MIND
 D:A pack of skulls animated by necromantic spells. 
 
-N:274:Mi-Go
-G:I:R
-I:120:13d8:20:30:20
-W:15:2:800:80
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:STING:POISON:1d4
-B:BITE:LOSE_STR:1d2
-F:IM_POIS | IM_COLD | COLD_BLOOD | ANIMAL | EVIL | 
-F:NO_SLEEP | NO_CONF | CAN_FLY | DROP_SKELETON | CTHANGBAND
-S:1_IN_6
-S:CONF | S_MONSTER | S_DEMON
-D:"They were pinkish things about five feet long; with crustaceous 
-D:bodies bearing vast pairs of dorsal fins or membranous wings and 
-D:several sets of articulate limbs, and with a sort of convoluted 
-D:ellipsoid, covered with multitudes of very short antenna, where 
-D:a head would ordinarily be..." 
-
 N:275:Giant tarantula
 G:S:o
 I:120:10d15:8:32:80
@@ -4148,9 +5378,14 @@ O:0:0:0:0
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | SPIDER | IM_POIS | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant spider with hairy black and red legs.
 
 N:276:Giant clear centipede
@@ -4161,10 +5396,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:STING:HURT:2d4
-F:ATTR_CLEAR | 
-F:INVISIBLE | WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:DROP_SKELETON
+F:INVISIBLE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:277:Mirkwood spider
@@ -4176,10 +5415,18 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD |
-F:WEIRD_MIND | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS |  DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:A strong and powerful spider from Mirkwood forest. Cunning and evil, it 
 D:seeks to taste your juicy insides. 
 
@@ -4191,10 +5438,22 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:COLD:5d8
 B:HIT:COLD:5d8
-F:DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | AURA_COLD | SUSCEP_FIRE |
-F:IM_COLD | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_COLD
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:A twelve foot tall giant covered in furs. 
 
 N:279:Griffon
@@ -4205,8 +5464,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:3d4
 B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is half lion, half eagle. It flies menacingly towards you. 
 
 N:280:Homunculus
@@ -4217,8 +5483,15 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:PARALYZE:1d2
 B:HIT:HURT:1d10
-F:OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is a small demonic spirit full of malevolence. 
 
 N:281:Gnome mage
@@ -4228,12 +5501,20 @@ W:15:2:900:40
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLINK | DARKNESS | BO_COLD | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BLINK
+S:BO_COLD
+S:DARKNESS
 S:S_MONSTER
 D:A mage of short stature. 
 
@@ -4246,10 +5527,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:ATTR_CLEAR | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:INVISIBLE | BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
 D:A faint sense of motion in the air, hound shaped, stands before you. 
 
 N:283:Umber hulk
@@ -4262,11 +5547,18 @@ B:GAZE:CONFUSE
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:2d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. 
 
@@ -4280,10 +5572,14 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:STUPID | WEIRD_MIND | KILL_ITEM |
-F:IM_ACID | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:KILL_ITEM
+F:MORTAL
+F:NO_CONF
+F:STUPID
+F:WEIRD_MIND
 D:It is a weird, small animal with two antennae popping forth from 
 D:its forehead. It looks hungry. 
 
@@ -4295,10 +5591,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:2d10
 B:HIT:HURT:2d10
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | ORC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:An unholy hybrid of ogre and orc.
 
 N:286:Gelatinous cube
@@ -4310,12 +5612,25 @@ O:40:30:20:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:DROP_1D2 | DROP_4D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:It is a strange, vast gelatinous structure that assumes cubic proportions 
 D:as it lines all four walls of the corridors it patrols. Through its 
 D:transparent jelly structure you can see treasures it has engulfed, and a 
@@ -4328,11 +5643,17 @@ W:16:2:150:65
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | WILD_TOO | WILD_SWAMP |
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
 D:A vast, foul-smelling dragonfly. 
 
@@ -4344,10 +5665,21 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:FIRE:6d8
 B:HIT:FIRE:6d8
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_VOLCANO | SUSCEP_COLD |
-F:EVIL | GIANT | MALE | AURA_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A glowing fourteen foot tall giant. Flames drip from its red skin. 
 
 N:289:Hummerhorn
@@ -4357,8 +5689,11 @@ W:16:4:100:4
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:2d2
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:A giant buzzing wasp, its stinger drips venom. 
 
@@ -4370,11 +5705,19 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:4d4
 B:HIT:HURT:4d4
-F:MALE | CAN_SWIM | IM_ACID |
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON
-F:EVIL 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
 D:Intelligent lizard beings from the depths. 
 
 N:291:Ulfast, Son of Ulfang
@@ -4387,12 +5730,21 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MALE | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
 D:A short and swarthy Easterling. 
 
 N:292:Crebain
@@ -4403,10 +5755,23 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
-F:ANIMAL | EVIL | MORTAL | FRIENDS | BASEANGBAND | DROP_CORPSE | HAS_EGG | 
-F:WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | WILD_VOLCANO | 
-F:WILD_GRASS | WILD_SWAMP | WILD_SHORE | WILD_OCEAN | CAN_FLY
-S:1_IN_8 | SHRIEK
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:HAS_EGG
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
+S:1_IN_8
+S:SHRIEK
 D:A type of crow, specially bred by the forces of evil as spies; their 
 D:rudimentary intelligence guided by an evil mind has tracked you down, 
 D:and now they seek to alert other evil creatures to your presence. 
@@ -4420,10 +5785,19 @@ O:20:80:0:0
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | HASTE | SCARE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+S:1_IN_4
+S:HASTE
+S:SCARE
 D:Even the strongest of normal human warriors fears the Berserker - the one who 
 D:can drive himself into such a terrible battle-frenzy that he can survive blows 
 D:which should kill him, and still apparently feel no pain.  He tramples weaker 
@@ -4439,13 +5813,27 @@ O:0:50:30:10
 B:BITE:LOSE_DEX:1d6
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NONLIVING | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:NONLIVING
+F:ONLY_ITEM
+F:RAND_25
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:The chaotic evil master's favourite pet. 
 
 N:295:Sphinx
@@ -4456,12 +5844,20 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | CAN_FLY | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
-S:SCARE | CONF
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_11
+S:CONF
+S:SCARE
 D:It will eat you if you cannot answer its riddle. 
 
 N:296:Imp
@@ -4472,13 +5868,29 @@ E:0:1:1:0:1:0
 O:30:20:50:0
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:ONLY_ITEM
+F:RAND_25
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:BO_FIRE
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:The lawful evil master's favourite pet. 
 
 N:297:Forest troll
@@ -4490,10 +5902,20 @@ O:30:70:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WOOD
 D:He is green-skinned and ugly. 
 
 
@@ -4504,9 +5926,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:COLD:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_FIRE | RAND_50 | RAND_25 | 
-F:EMPTY_MIND | AURA_COLD |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_COLD
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_FIRE
 D:A semi-sentient snowball, hurling itself at targets at random.
 
 N:299:Jumping fireball
@@ -4516,9 +5949,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:FIRE:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_COLD |
-F:EMPTY_MIND | AURA_FIRE | RAND_50 | RAND_25 | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_COLD
 D:A semi-sentient fireball that moves around randomly.
 
 N:300:Ball lightning
@@ -4528,9 +5972,19 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:ELEC:8d8
-F:FORCE_SLEEP | CAN_FLY | RAND_25 | RAND_50 | 
-F:EMPTY_MIND | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE |NO_CUT
+F:AURA_ELEC
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A crackling ball of energy, zooming about seemingly at random.
 
 N:301:2-headed hydra
@@ -4541,11 +5995,22 @@ E:0:1:0:2:2:0
 O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_1D2 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | HAS_EGG | IMPRESED | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_11
 S:SCARE
 D:A strange reptilian creature with two heads, guarding its hoard. 
 
@@ -4557,8 +6022,11 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:TERRIFY:2d5
 B:CLAW:TERRIFY:5d2
-F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_SWAMP
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A creature that was once human, but is now as green as moss. 
 
 N:303:Water spirit
@@ -4569,10 +6037,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
 D:A whirlpool of sentient liquid. 
 
 N:304:Giant red scorpion
@@ -4583,9 +6058,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:STING:LOSE_STR:1d7
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is fast and poisonous. 
 
 N:305:Earth spirit
@@ -4596,11 +6074,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:PASS_WALL | CAN_FLY |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
 D:A whirling form of sentient rock. 
 
 N:306:Fire spirit
@@ -4611,10 +6098,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:2d6
 B:HIT:FIRE:2d6
-F:RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | CAN_FLY | SUSCEP_COLD | 
-F:IM_FIRE | IM_POIS | WILD_TOO | WILD_VOLCANO |
-F:NO_CONF | NO_SLEEP | NO_FEAR | AURA_FIRE | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A whirlwind of sentient flame. 
 
 N:307:Fire hound
@@ -4626,12 +6124,17 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 |
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+S:1_IN_10
 S:BR_FIRE
 D:Flames lick at its feet and its tongue is a blade of fire. You can feel a 
 D:furnace heat radiating from the creature. 
@@ -4645,12 +6148,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:COLD:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | SUSCEP_FIRE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:SUSCEP_FIRE
+S:1_IN_10
 S:BR_COLD
 D:A hound as tall as a man, this creature appears to be composed of angular 
 D:planes of ice. Cold radiates from it and freezes your breath in the air. 
@@ -4664,12 +6171,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:ELEC:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | IM_ELEC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+S:1_IN_10
 S:BR_ELEC
 D:Saint Elmo's Fire forms a ghostly halo around this hound, and sparks sting 
 D:your fingers as energy builds up in the air around you. 
@@ -4683,12 +6194,22 @@ O:10:10:10:10
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_COLD |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as some object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4701,12 +6222,21 @@ O:0:0:0:0
 B:HIT:POISON:3d4
 B:HIT:CONFUSE:2d3
 B:HIT:PARALYZE:2d3
-F:CHAR_MULTI | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as a door to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4717,9 +6247,17 @@ W:18:2:400:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
-F:RAND_25 | FRIENDS | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | RES_TELE | MORTAL | BASEANGBAND
-S:1_IN_4 | BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:RES_TELE
+S:1_IN_4
+S:BLINK
+S:TELE_TO
 D:A strange magical member of the canine race, its form seems to shimmer and 
 D:fade in front of your very eyes. 
 
@@ -4731,12 +6269,20 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_9
 S:ARROW_2
 D:It is a cunning orc of power, as tall as a man, and stronger. It fears 
 D:little. 
@@ -4751,13 +6297,24 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:He is an orc of power and great cunning, leader of the garrison at Cirith Ungol. 
 
 N:315:Gorbag, the Orc Captain
@@ -4770,13 +6327,23 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:He is an orc of power and great cunning, leader of the garrison at Minas Morgul. 
 
 N:316:Shambling mound
@@ -4787,10 +6354,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:ONLY_GOLD | DROP_90 | WILD_TOO | WILD_SWAMP |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:A pile of rotting vegetation that slides towards you with a disgusting 
 D:stench, waking all it nears. 
@@ -4804,45 +6380,19 @@ O:0:0:0:0
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
-F:NEVER_MOVE | EMPTY_MIND | STUPID | CHAR_CLEAR | CHAR_MULTI | 
-F:WILD_ONLY | WILD_WOOD | WILD_SWAMP | ANIMAL | SUSCEP_FIRE | NO_CUT
+F:ANIMAL
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CUT
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_ONLY
+F:WILD_WOOD
 D:A carnivorous plant that is difficult to detect, until it suddenly snaps shut 
 D:around its prey and releases paralysing enzymes to stop its struggles. 
 
-N:318:Chaos beastman
-G:H:u
-I:110:20d8:20:50:30
-W:18:2:2300:75
-E:0:0:0:0:0:0
-O:25:45:20:0
-B:HIT:CONFUSE:3d5
-B:HIT:EXP_20:3d5
-F:DROP_1D2
-F:OPEN_DOOR | BASH_DOOR | NO_CONF | NO_SLEEP | DROP_CORPSE
-F:EVIL | IM_POIS | IM_FIRE | ATTR_ANY | ATTR_MULTI
-F:MORTAL | ZANGBAND
-S:1_IN_8
-S:MISSILE | BO_FIRE | CONF | TPORT
-D:A truly loathsome thing, twisted by chaos, it is a mixture 
-D:of several different kinds of creature. 
-
-N:319:Daemonette of Slaanesh
-G:u:R
-I:120:12d8:20:50:30
-W:18:2:2000:75
-E:1:1:1:0:1:1
-O:30:0:30:40
-B:CLAW:CONFUSE:3d5
-B:CLAW:CONFUSE:3d5
-F:FORCE_MAXHP |  DROP_60 | FEMALE |
-F:OPEN_DOOR | BASH_DOOR | IM_COLD | NO_CONF | NO_SLEEP |
-F:EVIL | DEMON | IM_POIS | IM_FIRE | ZANGBAND
-S:1_IN_8
-S:SCARE | S_DEMON | CAUSE_2 | CONF | BO_FIRE | BO_COLD 
-D:It is minor female demon, vaguely human-like, but with crab-like 
-D:pincers instead of hands. She wears a rather indecent skimpy 
-D:leather bikini, moves quickly and casts deadly spells! 
-
 N:320:Giant bronze dragon fly
 G:F:U
 I:120:3d8:12:20:50
@@ -4850,11 +6400,19 @@ W:18:2:150:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
 D:This vast gleaming bronze fly has wings which beat mesmerically fast. 
 
@@ -4866,9 +6424,18 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | WILD_TOO | WILD_MOUNTAIN | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is eighteen feet tall and looking at you. 
 
 N:322:Giant black dragon fly
@@ -4878,11 +6445,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
 D:The size of a large bird, this fly drips caustic acid. 
 
@@ -4894,10 +6467,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:COLD_BLOOD | EMPTY_MIND | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue. 
 
 N:324:Red mold
@@ -4907,10 +6489,17 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:FIRE:4d4
-F:NEVER_MOVE | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | 
-F:IM_FIRE | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_COLD
 D:It is a strange red growth on the dungeon floor; it seems to burn with 
 D:flame. 
 
@@ -4921,29 +6510,22 @@ W:22:2:150:75
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | WILD_TOO | WILD_MOUNTAIN |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
 D:Large beating wings support this dazzling insect. A loud buzzing noise 
 D:pervades the air. 
 
-N:326:Stunwall
-G:#:W
-I:110:4d8:45:25:0
-W:18:5:1000:50
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:PARALYZE:10d1
-B:TOUCH:PARALYZE:10d1
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | CHAR_MULTI | 
-F:EMPTY_MIND | HURT_ROCK | ZANGBAND | NO_CUT
-D:A sentient section of wall. 
-
 N:327:Ghast
 G:z:u
 I:120:30d10:40:40:20
@@ -4954,9 +6536,20 @@ B:CLAW:PARALYZE:2d4
 B:CLAW:PARALYZE:2d4
 B:BITE:LOSE_CON:2d4
 B:BITE:LOSE_CHR:2d4
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | ESCORT | 
-F:NO_SLEEP | NO_CONF | UNDEAD | EVIL | IM_POIS | IM_COLD | 
-F:COLD_BLOOD | HURT_LITE | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:This vile abomination is a relative of ghouls, and often leads packs 
 D:of them. It smells foul, and its bite carries a rotting disease. 
 
@@ -4965,10 +6558,15 @@ G:I:D
 I:120:3d2:8:18:10
 W:19:4:100:4
 B:BITE:POISON:2d2
-F:RAND_50 | RAND_25 | CAN_FLY | WILD_SWAMP | WILD_TOO | 
-F:WEIRD_MIND | ANIMAL | EVIL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_12 | 
+F:ANIMAL
+F:CAN_FLY
+F:EVIL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_12
+S:MULTIPLY
 S:SHRIEK
 D:Believed to be an evil relative of the cricket, this creature gets its name 
 D:from its incessant squeaking, which can best be described as "neek-breek, 
@@ -4985,11 +6583,21 @@ B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
-F:DROP_60 | NO_SLEEP | NO_CONF | ANIMAL | WEIRD_MIND | SUSCEP_FIRE | 
-F:RES_WATE | IM_COLD | NEVER_MOVE | WILD_ONLY | WILD_WOOD | 
-F:BASEANGBAND | NO_CUT
+F:ANIMAL
+F:DROP_60
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_WATE
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_ONLY
+F:WILD_WOOD
 S:1_IN_9
-S:BLINK | TELE_TO
+S:BLINK
+S:TELE_TO
 D:A very strong near-sentient tree, which has become hostile to other living things. 
 
 N:330:Bolg, Son of Azog
@@ -5002,13 +6610,24 @@ B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A large and powerful orc, he looks just like his father. He is tall and 
 D:fast, but fortunately blessed with orcish brains. 
 
@@ -5021,12 +6640,21 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | CAN_SWIM |
-F:ANIMAL | SPIDER | IM_POIS | RES_TELE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:RES_TELE
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
+S:BLINK
+S:TELE_TO
 D:A spider that never seems quite there. Everywhere you look it is just 
 D:half-seen in the corner of one eye. 
 
@@ -5039,11 +6667,20 @@ O:50:50:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:WAIL:TERRIFY
-F:MALE | CAN_SWIM | IM_ACID | IM_POIS | WILD_SHORE |
-F:DROP_60 | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
 D:A lizardman leader. 
 
 N:333:Landmine
@@ -5053,10 +6690,19 @@ W:20:5:300:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:HURT:25d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 N:334:Wyvern
@@ -5069,11 +6715,24 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:STING:POISON:1d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_2D2 | IM_POIS | CAN_FLY | HAS_EGG | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | 
-F:ANIMAL | EVIL | DRAGON | BASEANGBAND | ATTR_MULTI
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IM_POIS
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving and deadly draconian animal. Beware its poisonous sting! 
 
 N:335:Great eagle
@@ -5085,9 +6744,16 @@ O:0:0:0:0
 B:CLAW:HURT:6d3
 B:CLAW:HURT:6d3
 B:BITE:HURT:3d6
-F:CAN_FLY |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | WILD_WASTE | WILD_WOOD | 
-F:ANIMAL | GOOD | DROP_CORPSE | BASEANGBAND | HAS_EGG
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
 D:Greater and more intelligent than most of its kind, this great eagle is 
 D:a messenger between the forces of good. 
 
@@ -5099,9 +6765,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | FRIENDS | CHAR_MULTI | HURT_ROCK | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:FRIENDS
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 S:MULTIPLY
 D:A sentient section of wall. 
 
@@ -5115,11 +6792,15 @@ B:BITE:HURT:1d8
 B:BITE:HURT:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR |
-F:ANIMAL | MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CUT
+S:1_IN_10
 S:BR_SHAR
 D:A beautiful crystalline shape does not disguise the danger this hound 
 D:clearly presents. Your flesh tingles as it approaches. 
@@ -5134,11 +6815,16 @@ B:BITE:POISON:1d8
 B:BITE:POISON:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | CAN_FLY |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+S:1_IN_10
 S:BR_POIS
 D:Swirling vapours surround this beast as it floats towards you, seemingly 
 D:walking on air. Noxious gases sting your throat. 
@@ -5153,9 +6839,14 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:BASH_DOOR | WILD_WOOD | WILD_TOO | WILD_GRASS |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A fierce and dangerous cat, its huge tusks and sharp claws would lacerate 
 D:even the strongest armour.  
 
@@ -5169,11 +6860,16 @@ B:BITE:ACID:1d8
 B:BITE:ACID:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:MORTAL
+S:1_IN_10
 S:BR_ACID
 D:Footprints are burned in the ground behind this hound as it pads 
 D:around the dungeon. An acrid smell of acid rises from the dog's pelt. 
@@ -5187,10 +6883,17 @@ O:0:0:0:0
 B:BUTT:HURT:2d8
 B:BITE:HURT:2d10
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:IM_FIRE | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_FIRE
 D:It is a strange concoction of goat, lion and dragon, with the heads of all 
 D:three beasts. 
@@ -5201,11 +6904,17 @@ I:110:6d8:10:1:0
 W:20:1:3000:250
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW
-F:EMPTY_MIND | INVISIBLE | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BLINK
 S:S_MONSTER
 D:It is a strange pulsing mound of flesh. 
 
@@ -5218,25 +6927,19 @@ O:0:0:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:A tall shaggy, furry humanoid, it could call the yeti brother. 
 
-N:344:Weir
-G:C:W
-I:110:10d12:15:30:40
-W:20:2:2010:150
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BITE:HURT:1d8
-B:BITE:HURT:1d8
-F:RAND_25 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | EVIL | FRIENDS | 
-F:MORTAL | ZANGBAND
-D:It is a tracker; half human, half beast. 
-
 N:345:Ranger
 G:p:W
 I:110:15d11:20:40:40
@@ -5245,12 +6948,22 @@ E:1:1:1:2:1:1
 O:20:50:20:0
 B:HIT:HURT:5d4
 B:HIT:HURT:5d4
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:DROP_SKELETON | DROP_CORPSE | BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 |  
-S:ARROW_2 | MISSILE | BO_COLD | BO_ELEC | BLINK | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:BLINK
+S:BO_COLD
+S:BO_ELEC
+S:MISSILE
+S:S_ANIMAL
 D:A warrior who is at one with nature.  A master of both bow and sword, with 
 D:minor spellcasting skills. 
 
@@ -5262,12 +6975,22 @@ E:1:1:1:2:1:1
 O:20:60:0:10
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_2 | SLOW | SCARE | BLIND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BLIND
+S:CAUSE_2
+S:HEAL
+S:SCARE
+S:SLOW
 D:A warrior for a holy cause.  Unfortunately, his god is not yours, and there is 
 D:rivalry even between the various gods of Good, so he is your enemy. 
 
@@ -5280,9 +7003,14 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
-F:RAND_25 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
 D:It is a huge wolf with eyes that glow with manly intelligence. 
 
 N:348:Dark elven lord
@@ -5293,12 +7021,25 @@ E:1:1:1:2:1:1
 O:0:80:20:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
-F:MALE | FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HASTE | BLIND | CONF | DARKNESS | BO_FIRE | BO_COLD | MISSILE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:HASTE
+S:MISSILE
 D:A dark elven figure in armour and radiating evil power. 
 
 N:349:Cloud giant
@@ -5309,9 +7050,17 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:8d8
 B:HIT:ELEC:8d8
-F:DROP_90 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:It is a twenty foot tall giant wreathed in clouds. 
 
 N:350:Ugluk, the Uruk
@@ -5324,13 +7073,25 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong and cunning orc warrior, the commander of Saruman's orcish horde. 
 
 N:351:Blue dragon bat
@@ -5340,12 +7101,15 @@ W:21:1:100:54
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:ELEC:1d3
-F:FORCE_SLEEP | 
-F:RAND_50 | 
-F:BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_ELEC | AI_ANNOY
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ELEC
+F:MORTAL
+F:RAND_50
+S:1_IN_4
 S:BR_ELEC
 D:It is a glowing blue bat with a sharp tail. 
 
@@ -5359,12 +7123,22 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | SUSCEP_FIRE |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_FIRE | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_FIRE
+S:1_IN_5
+S:BLIND
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5379,12 +7153,21 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BUTT:CONFUSE:4d4
 B:SPIT:BLIND:4d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BA_POIS |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5397,11 +7180,24 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_VOLCANO | WILD_TOO | SUSCEP_COLD |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL |  AURA_FIRE |
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:1_IN_6 | 
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_FIRE
 D:A whirling maelstrom of fire. 
 
@@ -5412,10 +7208,19 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ACID:3d3
-F:FORCE_SLEEP | RAND_50 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_ACID | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ACID
 D:A caustic spinning whirlpool of foaming, steaming water. 
 
@@ -5429,32 +7234,25 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A large and powerful orc, captain of one of Saruman's orcish regiments. 
 
-N:357:Arch-vile
-G:u:W
-I:130:11d11:100:30:0
-W:21:1:100:300
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:3d9
-B:CLAW:HURT:3d9
-F:RAND_50 | EVIL | DEMON | FORCE_SLEEP | FORCE_MAXHP |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | COLD_BLOOD |
-F:IM_FIRE | RES_NETH |  NO_CONF | NO_SLEEP | NONLIVING | NO_STUN | 
-F:ZANGBAND
-S:1_IN_3 |
-S:BA_FIRE | ANIM_DEAD
-D:A pale, corpse-like lesser demon, who moves very fast and spawns evil 
-D:everywhere. 
-
 N:358:Cold vortex
 G:v:w
 I:110:9d9:100:30:0
@@ -5462,10 +7260,22 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:COLD:3d3
-F:FORCE_SLEEP | RAND_50 | AURA_COLD | COLD_BLOOD | SUSCEP_FIRE |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_FIRE
+S:1_IN_6
 S:BR_COLD
 D:A twisting whirlpool of frost. 
 
@@ -5476,10 +7286,21 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ELEC:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | HAS_LITE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ELEC
 D:A shimmering tornado of air, sparks crackle along its length. 
 
@@ -5491,10 +7312,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:10d5
 B:BITE:POISON:10d5
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AQUATIC |
-F:IM_POIS | NO_STUN | WILD_TOO | COLD_BLOOD | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NO_STUN
+F:POWERFUL
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:This fish is among the most poisonous creatures there are. 
 
@@ -5503,8 +7331,11 @@ G:I:r
 I:120:3d2:8:18:10
 W:24:4:100:4
 B:BITE:BLIND:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | 
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Clouds of these monsters light up the dungeon - so brightly that you can 
 D:barely see through them. 
@@ -5517,11 +7348,20 @@ E:1:1:1:2:1:1
 O:10:70:0:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an orcish figure covered in wrappings. 
 
 N:363:Wolf chieftain
@@ -5532,31 +7372,24 @@ B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
 B:WAIL:TERRIFY
-F:ESCORTS | FORCE_MAXHP | IM_COLD | IM_ACID | 
-F:SMART | ESCORT | ANIMAL | EVIL | MORTAL | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | MALE
-S:1_IN_8 | DARKNESS
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:DARKNESS
 D:A great wolf-chieftain whose pack is in the service of the Dark Lord, 
 D:and whose howls strike fear into even the boldest heart. 
 
-N:364:Serpent man
-G:J:G
-I:120:15d10:20:40:20
-W:22:3:900:75
-E:1:1:1:2:1:1
-O:25:20:25:20
-B:BITE:POISON:5d5
-B:BITE:POISON:5d5
-F:MALE | CAN_SWIM | IM_POIS | IM_ACID |
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | MORTAL | ZANGBAND
-S:1_IN_8
-S:BA_POIS | S_MONSTER | SCARE | HOLD
-D:"They walked lithely and sinuously erect on pre-mammalian 
-D:members, their pied and hairless bodies bending with great 
-D:suppleness. There was a loud hissing of formulae as they 
-D:went to and fro."
-
 N:365:Vampiric mist
 G:#:D
 I:110:10d8:12:55:30
@@ -5565,9 +7398,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:EXP_20:1d6
 B:ENGULF:EXP_20:1d6
-F:RAND_25 | SUSCEP_ELEC | UNDEAD |
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH | WILD_TOO | WILD_SWAMP |
-F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CUT
+F:RAND_25
+F:RES_NETH
+F:SUSCEP_ELEC
+F:UNDEAD
+F:WILD_TOO
 D:A cloud of evil, sentient mist. 
 
 N:366:Killer stag beetle
@@ -5578,9 +7421,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
-F:RAND_25 | WILD_TOO | DROP_CORPSE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle with vicious claws. 
 
 N:367:Iron golem
@@ -5590,11 +7438,21 @@ W:22:2:3800:160
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
-F:FORCE_SLEEP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_7
 S:SLOW
 D:It is a massive metal statue that moves steadily towards you. 
 
@@ -5608,9 +7466,21 @@ B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
-F:FORCE_SLEEP | RES_TELE
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
 D:It looks like a huge spiked roller, moving on its own towards you. 
 
 N:369:Giant yellow scorpion
@@ -5621,27 +7491,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
 B:STING:POISON:2d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant scorpion with a sharp stinger. 
 
-N:370:Jade monk
-G:p:G
-I:120:10d9:22:45:5
-W:23:1:1200:100
-E:1:1:1:2:1:1
-O:30:0:60:10
-B:KICK:HURT:4d1
-B:KICK:HURT:4d1
-B:HIT:HURT:4d5
-B:HIT:HURT:4d5
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | NO_CONF | NO_SLEEP |
-F:MALE | DROP_60 | DROP_1D2 | IM_FIRE | IM_COLD | IM_POIS | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:A monk trained in martial arts. 
-
 N:371:Black ooze
 G:j:D
 I:90:6d8:10:6:1
@@ -5649,13 +7506,22 @@ W:23:1:400:7
 E:0:0:0:0:0:0
 O:30:0:40:15
 B:TOUCH:ACID:2d6
-F:RAND_50 | DROP_60 | STUPID | EMPTY_MIND | CAN_SWIM |
-F:TAKE_ITEM | KILL_BODY | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:MULTIPLY
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:OPEN_DOOR
+F:RAND_50
+F:STUPID
+F:TAKE_ITEM
+S:1_IN_11
 S:DRAIN_MANA
+S:MULTIPLY
 D:It is a strangely moving puddle. 
 
 N:372:Hardened warrior
@@ -5666,10 +7532,16 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:6d5
 B:HIT:HURT:6d5
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A scarred warrior who moves with confidence. 
 
 N:373:Azog, King of the Uruk-Hai
@@ -5681,32 +7553,28 @@ O:10:90:0:0
 B:HIT:HURT:5d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | ESCORTS | SPECIAL_GENE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:He is also known as the King of Khazad-dum. His ego is renowned to be 
 D:bigger than his head. 
 
-N:374:Fleshhound of Khorne
-G:C:R
-I:120:25d25:15:30:70
-W:30:3:700:150
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:4d1
-B:CLAW:HURT:4d1
-B:BITE:HURT:6d1
-B:BITE:HURT:6d1
-F:BASH_DOOR | DEMON | NO_STUN | NO_FEAR |
-F:ANIMAL | EVIL | IM_FIRE | NO_SLEEP | NO_CONF | 
-F:RES_NETH | RES_NEXU | RES_DISE | RES_PLAS | ZANGBAND
-D:A revolting canine creature, a huge demon hound with a somewhat 
-D:reptilian head. 
-
 N:375:Dark elven warlock
 G:h:v
 I:120:7d10:20:16:20
@@ -5715,13 +7583,24 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | FRIENDS
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:CONF | MISSILE | DARKNESS | BO_MANA
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BO_MANA
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven mage with spells of frightening destructive power. 
 
 N:376:Master rogue
@@ -5733,10 +7612,17 @@ O:80:10:10:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:EAT_GOLD:4d4
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_2D2 | SUSCEP_ELEC |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_ELEC
+F:TAKE_ITEM
 D:A thief of great power and shifty speed. 
 
 N:377:Red dragon bat
@@ -5746,10 +7632,16 @@ W:23:1:100:60
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:FORCE_SLEEP | RAND_50 | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | AI_ANNOY
-F:ANIMAL | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:RAND_50
+F:SUSCEP_COLD
+S:1_IN_4
 S:BR_FIRE
 D:It is a sharp-tailed bat, wreathed in fire. 
 
@@ -5760,9 +7652,14 @@ W:23:1:500:85
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:4d5
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is looking for prey. 
 
 N:379:Ice skeleton
@@ -5773,10 +7670,20 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:CLAW:COLD:2d3
 B:CLAW:COLD:2d3
-F:ONLY_ITEM | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
 D:It is a skeleton covered in frost. 
 
 N:380:Angamaite of Umbar
@@ -5789,14 +7696,27 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:FORGET
+S:SLOW
 D:A Black Numenorean who hates the men of the west. 
 
 N:381:Forest wight
@@ -5808,13 +7728,25 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:SCARE | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_10
+S:DRAIN_MANA
+S:SCARE
 D:It is a ghostly apparition with a humanoid form. 
 
 N:382:Khim, Son of Mim
@@ -5827,14 +7759,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Khim is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -5848,14 +7793,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Ibun is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -5868,9 +7826,17 @@ O:0:0:0:0
 B:CLAW:HURT:7d3
 B:CLAW:HURT:7d3
 B:BITE:HURT:3d7
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among all the eagles of Middle-earth he is the swiftest, and in his time 
 D:has borne messages between all of the Wise.  It was Meneldor who bore the 
 D:Ring-bearer away from the destruction of Mount Doom. 
@@ -5883,8 +7849,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d33
 B:HIT:HURT:2d44
-F:PASS_WALL | NO_SLEEP | COLD_BLOOD | NONLIVING | NO_FEAR |
-F:FORCE_MAXHP | RES_TELE | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RES_TELE
 D:A creature that is half real, half illusion. 
 
 N:386:Giant silver ant
@@ -5894,9 +7868,14 @@ W:23:1:800:45
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:4d4
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant silver ant with a caustic bite. 
 
 N:387:4-headed hydra
@@ -5909,11 +7888,19 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_7 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_7
 S:SCARE
 D:A strange reptilian creature with four heads, guarding its hoard. 
 
@@ -5926,28 +7913,29 @@ O:0:0:0:0
 B:GAZE:TERRIFY:1d4
 B:GAZE:TERRIFY:1d4
 B:CRUSH:HURT:44d1
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU |
-F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | JOKEANGBAND | HAS_LITE
-S:1_IN_9 |
-S:TPORT | BLINK | TELE_AWAY
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+S:1_IN_9
+S:BLINK
+S:TELE_AWAY
+S:TPORT
 D:This creature just might crush you. 
 
-N:389:Tyrannosaur
-G:R:g
-I:120:200d3:20:70:20
-W:24:2:5000:350
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-B:BITE:HURT:3d6
-B:BITE:HURT:3d6
-F:FORCE_SLEEP | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | ZANGBAND
-D:A horror from prehistory, reawakened by chaos. 
-
 N:390:Mummified human
 G:z:w
 I:110:17d9:20:34:60
@@ -5956,10 +7944,20 @@ E:1:1:1:2:1:1
 O:20:40:20:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:ONLY_ITEM | DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a human form encased in mouldy wrappings. 
 
 N:391:Vampire bat
@@ -5970,9 +7968,19 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:EXP_40:1d4
 B:BITE:EXP_40:1d4
-F:RAND_50 | COLD_BLOOD | REGENERATE | CAN_FLY |
-F:EVIL | ANIMAL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_50
+F:REGENERATE
+F:UNDEAD
 D:A blood-sucking bat that flies at your neck hungrily. 
 
 N:392:Sangahyando of Umbar
@@ -5985,35 +7993,28 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
-D:A Black Numenorean with a blacker heart. 
-
-N:393:It
-G:.:W
-I:110:77d9:25:80:25
-W:24:3:500:400
-E:0:0:0:0:0:0
-O:10:0:90:0
-B:GAZE:BLIND:8d8
-B:TOUCH:TERRIFY
-B:GAZE:EXP_40
-B:TOUCH:EAT_ITEM
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT | DROP_CORPSE | 
-F:CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | UNIQUE | FORCE_MAXHP | NO_SLEEP | CAN_SPEAK | REFLECTING |
-F:IM_FIRE | IM_ELEC | EMPTY_MIND | EVIL | SMART | RES_TELE | CAN_FLY | 
-F:ZANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 S:1_IN_4
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | S_UNDEAD | S_MONSTER |
-S:HEAL | TELE_AWAY | DARKNESS | S_HYDRA | TRAPS | FORGET | TELE_TO | SHRIEK
-D:Nobody has ever seen It. 
+S:FORGET
+S:SLOW
+D:A Black Numenorean with a blacker heart. 
 
 N:394:Banshee
 G:G:b
@@ -6023,13 +8024,24 @@ E:0:0:0:0:0:0
 O:80:0:0:15
 B:WAIL:TERRIFY
 B:TOUCH:EXP_20
-F:FEMALE | 
-F:RAND_50 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is a ghostly woman's form that wails mournfully. 
 
 N:395:Carrion crawler
@@ -6040,31 +8052,16 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:PARALYZE:2d6
 B:STING:PARALYZE:2d6
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:A hideous centipede covered in slime and with glowing tentacles around its 
 D:head. 
 
-N:396:Xiclotlan
-G:#:D
-I:110:25d13:15:60:10
-W:25:2:6000:60
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:6d4
-B:CRUSH:HURT:6d4
-B:BITE:HURT:3d2
-F:RAND_25 | SUSCEP_ACID |
-F:EMPTY_MIND | BASH_DOOR | 
-F:IM_POIS | IM_ELEC | 
-F:MORTAL | CTHANGBAND | NO_CUT
-D:"...a metallically grey tree... about sixteen feet high with 
-D:very thick cylindrical branches... cylinders further 
-D:divided into six flat circular extensions... and from the top 
-D:of what I had taken for a trunk rose a featureless oval... an 
-D:orifice gaping at the top." 
-
 N:397:Silent watcher
 G:g:s
 I:110:80d25:60:80:0
@@ -6075,12 +8072,33 @@ B:GAZE:TERRIFY
 B:GAZE:PARALYZE
 B:GAZE:LOSE_STR
 B:GAZE:HALLU
-F:EMPTY_MIND | COLD_BLOOD | NONLIVING | NEVER_MOVE |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | EVIL |
-F:HURT_ROCK | COLD_BLOOD | HURT_LITE | NO_FEAR |
-F:NO_CONF | NO_SLEEP | NO_STUN | NONLIVING | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:SHRIEK | S_MONSTER | S_MONSTERS | HOLD | CONF | MIND_BLAST | DRAIN_MANA
+F:COLD_BLOOD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RES_TELE
+S:1_IN_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:S_MONSTER
+S:S_MONSTERS
 D:A figure carved from stone, with three vulture faces whose eyes glow 
 D:with a malevolent light.  None escape its vigilance. 
 
@@ -6092,31 +8110,25 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:SLOW | CONF | BO_ACID
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BO_ACID
+S:CONF
+S:SLOW
 D:A stumpy figure carved from stone, with glittering eyes. 
 
-N:399:Disenchanter beast
-G:q:v
-I:110:30d30:12:60:12
-W:25:2:2000:250
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-F:STUPID | WEIRD_MIND | RES_DISE | DROP_CORPSE | ATTR_MULTI | 
-F:IM_ACID | IM_POIS | 
-F:NO_CONF | ZANGBAND
-D:It looks like an anteater, and there is a static feeling 
-D:crackling around its long trunk. 
-
 N:400:Dark elven druid
 G:h:G
 I:120:20d20:15:75:10
@@ -6126,14 +8138,27 @@ O:10:0:80:10
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:HIT:HURT:3d8
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | CONF | DARKNESS | 
-S:S_MONSTER | S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_ANIMAL
+S:S_MONSTER
+S:S_SPIDER
 D:A powerful dark elf, with mighty nature-controlling enchantments. 
 
 N:401:Stone troll
@@ -6145,27 +8170,21 @@ O:0:100:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:MALE
+F:NO_CUT
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:He is a giant troll with scabrous black skin. 
 
-N:402:Black
-G:j:d
-I:111:12d12:12:65:30
-W:25:1:0:50
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:EXP_40:2d6
-B:ENGULF:EXP_40:2d6
-F:RAND_25 | 
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH |
-F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS | CTHANGBAND | NO_CUT
-D:The eldritch  blood of Yibb-Tstll is know only as "the Black": it is 
-D:an amorphous substance, which will suck your life and deliver it to 
-D:Yibb-Tstll. 
-
 N:403:Hill troll
 G:T:s
 I:110:21d10:20:65:40
@@ -6175,11 +8194,21 @@ O:30:70:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:A large troll with an extremely tough and warty hide.
 
 N:404:Wereworm
@@ -6192,9 +8221,14 @@ B:GAZE:EXP_20
 B:CRAWL:ACID:2d4
 B:BITE:HURT:1d10
 B:BITE:POISON:1d6
-F:BASH_DOOR | EVIL | CAN_SWIM | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:WILD_TOO
 D:A huge wormlike shape dripping acid, twisted by evil sorcery into a foul 
 D:monster that breeds on death. 
 
@@ -6205,9 +8239,14 @@ W:25:1:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:4d4
-F:RAND_25 | WILD_TOO |
-F:WEIRD_MIND | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant beetle with poisonous mandibles. 
 
 N:406:Disenchanter bat
@@ -6218,28 +8257,17 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:HIT:UN_BONUS
 B:HIT:UN_BONUS
-F:FORCE_SLEEP | RAND_50 | ANIMAL | MORTAL | ATTR_MULTI | 
-F:DROP_CORPSE | AI_ANNOY | CAN_FLY | BASEANGBAND | WEIRD_MIND
+F:AI_ANNOY
+F:ANIMAL
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 D:A giant bat which feeds on raw magical energy. 
 
-N:407:Gnoph-Keh
-G:q:s
-I:110:20d8:12:50:25
-W:26:2:1500:95
-E:0:1:0:2:1:0
-O:20:40:20:10
-B:CLAW:COLD:2d4
-B:CLAW:COLD:2d4
-B:BUTT:HURT:2d9
-F:RAND_25 | DROP_90 | DROP_60
-F:OPEN_DOOR | BASH_DOOR | AURA_COLD | IM_COLD | SUSCEP_FIRE |
-F:ANIMAL | DROP_CORPSE | CTHANGBAND
-S:1_IN_8
-S:BR_COLD | BO_ICEE | BO_COLD | BA_COLD
-D:A creature with a sharp horn: "the hairy myth-thing of the 
-D:Greenland ice, that walked sometimes on two legs, sometimes 
-D:on four, and sometimes on six." 
-
 N:408:Giant grey ant
 G:a:s
 I:110:19d8:10:40:40
@@ -6247,9 +8275,12 @@ W:26:1:700:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:KILL_BODY
+F:RAND_25
+F:WEIRD_MIND
 D:It is an ant encased in shaggy grey fur. 
 
 N:409:Khufu, the Mummified King
@@ -6262,13 +8293,34 @@ B:GAZE:TERRIFY
 B:HIT:DISEASE:6d6
 B:CLAW:LOSE_CON:4d4
 B:CLAW:LOSE_CON:4d4
-F:UNIQUE | MALE | CAN_SPEAK | UNDEAD | EVIL | ESCORTS | ESCORT | 
-F:FORCE_MAXHP | COLD_BLOOD | IM_POIS | IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_5 |
-S:TRAPS | CAUSE_3 | DARKNESS | S_UNDEAD | SCARE | SLOW | 
-S:S_KIN | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_90
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_5
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
+S:SLOW
+S:S_KIN
+S:S_UNDEAD
 D:He is out to have revenge on those who have desecrated his tomb. 
 
 N:410:Gwaihir the Windlord
@@ -6280,9 +8332,17 @@ O:0:0:0:0
 B:CLAW:HURT:15d2
 B:CLAW:HURT:15d2
 B:BITE:HURT:3d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:The greatest of eagles in the Third Age of Middle-earth, Gwaihir rescued 
 D:Gandalf the Wizard from Orthanc, and has twice brought his flock to the 
 D:aid of Sauron's enemies in battle - first outside the gates of Erebor in 
@@ -6295,10 +8355,15 @@ W:26:2:200:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:RAND_25 | SUSCEP_COLD |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:It is smoking and burning with great heat. 
 
 N:412:Displacer beast
@@ -6311,8 +8376,11 @@ B:BITE:HURT:2d8
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:INVISIBLE | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:INVISIBLE
+F:MORTAL
 D:It is a huge black panther, clubbed tentacles sprouting from its shoulders. 
 
 N:413:Ulwarth, Son of Ulfang
@@ -6324,12 +8392,22 @@ O:40:60:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_MAXHP | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:A short and swarthy Easterling. 
 
 N:414:Werebear
@@ -6342,9 +8420,15 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
 B:CRUSH:HURT:2d6
-F:BASH_DOOR | OPEN_DOOR | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | EVIL | DROP_1D2 | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:In the eyes of this bear, there glimmers the faintest light of intelligence.  
 D:And then its form begins to change... The combination of animal cunning, 
 D:human intelligence and the great physical strength of the bear makes for 
@@ -6358,10 +8442,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:A giant orc-like figure with an awesomely muscled frame. 
 
 N:416:White wraith
@@ -6373,13 +8462,24 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:SCARE
 D:It is a tangible but ghostly form made of white fog. 
 
 N:417:Angel
@@ -6392,12 +8492,27 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR |
-F:ONLY_ITEM | DROP_2D2 | GOOD | CAN_FLY |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | FORGET
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:CONF
+S:FORGET
+S:SCARE
 D:Who knows why you are now facing an angel as an enemy? Is it a punishment 
 D:from your own god for your sins, or a test of your mettle, or has this angel 
 D:been sent by another god on behalf of someone who wishes to claim the glory 
@@ -6413,11 +8528,23 @@ O:0:45:35:10
 B:CLAW:DISEASE:1d4
 B:CLAW:DISEASE:1d4
 B:BITE:PARALYZE:1d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | UNDEAD | FRIENDS | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_9
-S:SCARE | HOLD
+S:HOLD
+S:SCARE
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:419:Mim, Betrayer of Turin
@@ -6430,15 +8557,35 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:UN_BONUS:3d12
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_DISE | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | SCARE | BO_ACID | BA_ACID | TPORT | S_MONSTER 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+F:RES_TELE
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
+S:HEAL
+S:SCARE
+S:S_MONSTER
+S:TPORT
 D:The last of his race, Mim is a Petty-Dwarf.  Petty-Dwarves are strange 
 D:creatures, powerful in sorcery and originating in the East.  They have 
 D:been hunted nearly to extinction by the High Elves. 
@@ -6451,10 +8598,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:EXP_20:2d13
 B:HIT:EXP_20:2d13
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
 D:A deadly blade of chaos, moving of its own volition.
 
 N:421:Killer fire beetle
@@ -6465,25 +8624,19 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:FIRE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | CAN_FLY | SUSCEP_COLD |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_VOLCANO
 D:It is a giant beetle wreathed in flames. 
 
-N:422:Beast of Nurgle
-G:q:y
-I:110:15d7:14:50:30
-W:27:2:2300:100
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:TOUCH:POISON:3d3
-B:TOUCH:DISEASE:3d3
-B:BITE:ACID:4d5
-F:WEIRD_MIND | BASH_DOOR | IM_ACID | IM_POIS |
-F:DEMON | EVIL | IM_FIRE | CAN_FLY | ZANGBAND
-D:It walks on four legs, but mostly resembles a slug-shaped jelly. 
-D:It even has two disgusting antennae in its head. Yecch! 
-
 N:423:Creeping adamantite coins
 G:$:G
 I:120:20d25:5:50:10
@@ -6494,9 +8647,18 @@ B:BITE:POISON:3d4
 B:TOUCH:POISON:3d5
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | CHAR_MULTI | 
-F:IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of coins made of precious adamant, slithering toward 
 D:you on lots of tiny legs. 
 
@@ -6509,26 +8671,19 @@ O:10:80:0:10
 B:CLAW:POISON:3d3
 B:CLAW:POISON:3d3
 B:BITE:HURT:1d6
-F:FRIENDS | DROP_60 | WILD_WOOD | WILD_MOUNTAIN | WILD_TOO | WILD_SWAMP | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | REGENERATE | 
-F:EVIL | TROLL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A powerful troll form. Venom drips from its needlelike claws. 
 
-N:425:Flamer of Tzeentch
-G:,:r
-I:110:60d15:10:70:20
-W:27:2:0:500
-E:1:0:1:2:0:0
-O:0:0:0:0
-B:ENGULF:FIRE:3d6
-B:ENGULF:FIRE:3d6
-F:FORCE_SLEEP |  BASH_DOOR | SUSCEP_COLD |
-F:IM_FIRE | IM_POIS | AURA_FIRE | DEMON | EVIL | RES_PLAS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BO_FIRE | BA_FIRE
-D:It looks like an inverted mushroom, with two flexible arms. 
-
 N:426:Roper
 G:#:D
 I:115:30d10:30:60:255
@@ -6539,33 +8694,35 @@ B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | NEVER_MOVE |
-F:ONLY_GOLD | DROP_2D2 | DROP_60 | DROP_1D2 | EVIL | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | IM_COLD | IM_FIRE | BASEANGBAND
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:BA_FIRE | BA_ELEC | BA_POIS | HASTE | 
-S:TRAPS | SHRIEK | HOLD | CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+S:1_IN_5
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:CONF
+S:HASTE
+S:HOLD
+S:SHRIEK
 D:This creature look like a pillar of rock. However, a closer 
 D:inspection reveals a glaring eye and powerful tentacles, 
 D:which crush its prey and feed it to the creature's hungry 
 D:mouth. 
 
-N:427:Headless
-G:H:u
-I:110:25d12:20:50:40
-W:27:1:1600:175
-E:1:1:1:2:0:1
-O:0:100:0:0
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-F:FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:WILD_MOUNTAIN | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ZANGBAND
-S:1_IN_6
-S:SCARE
-D:Headless humanoid abominations created by a magical mutation. 
-
 N:428:Vibration hound
 G:Z:y
 I:110:25d10:30:30:0
@@ -6576,12 +8733,16 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_SOUN
 D:A blurry canine form which seems to be moving as fast as the eye can 
 D:follow. You can feel the earth resonating beneath your feet. 
@@ -6596,11 +8757,17 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | RES_NEXU | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | RES_TELE | NO_SLEEP | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_5
 S:BR_NEXU
 D:A locus of conflicting points coalesce to form the vague shape of a huge 
 D:hound. Or is it just your imagination? 
@@ -6613,10 +8780,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | SMART | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 D:A giant, brutish figure, as ugly as an orc, but with some of the 
 D:intelligence of his half-human ancestry.
 
@@ -6629,12 +8802,25 @@ O:5:85:0:5
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
-F:UNIQUE | MALE | CAN_SPEAK | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | GIANT | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:GIANT
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_SHORE
+F:WILD_TOO
 D:An ogre renowned for acts of surprising cruelty, Lokkak is the leader of a large 
 D:band of violent ogres.
 
@@ -6648,13 +8834,31 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -6667,30 +8871,18 @@ O:0:0:0:0
 B:BUTT:HURT:2d10
 B:BITE:FIRE:2d10
 B:GAZE:PARALYZE:2d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND
-S:1_IN_8 | 
-S:BR_FIRE 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:SUSCEP_COLD
+S:1_IN_8
+S:BR_FIRE
 D:The result of evil experiments, this travesty of nature should never be 
 D:alive.  It has three heads - goat, dragon and gorgon - all attached to a 
 D:lion's body. 
 
-N:434:Shantak
-G:H:D
-I:120:25d20:12:55:10
-W:27:2:6000:280
-E:0:1:1:0:1:0
-O:0:0:0:0
-B:BITE:HURT:1d6
-B:BITE:HURT:1d6
-B:BITE:HURT:1d6
-F:ANIMAL | IM_ACID | EVIL | ELDRITCH_HORROR | CAN_FLY | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:SCARE | HASTE
-D:A scaly bird larger than an elephant, with a horse-like head.
-
 N:435:Colbran
 G:g:y
 I:120:80d12:12:80:10
@@ -6699,11 +8891,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:ELEC:3d8
 B:HIT:ELEC:3d8
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | CAN_FLY |
-F:IM_ELEC | IM_POIS | AURA_ELEC | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+S:1_IN_3
 S:BO_ELEC
 D:A man-shaped form of living lightning, sparks and shocks crackle all over 
 D:this madly capering figure, as it leaps and whirls around and about you. 
@@ -6718,49 +8920,28 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:HEAL | BLIND | MIND_BLAST | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_4
+S:BLIND
+S:DARKNESS
+S:HEAL
+S:MIND_BLAST
 D:A wraithly snake-like form with the torso of a beautiful woman, it is the 
 D:most powerful of its kind. 
 
-N:437:Corpser
-G:,:D
-I:112:30d15:20:75:120
-W:28:2:0:65
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-F:WILD_TOO | WILD_GRASS |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | ZANGBAND
-D:A creature who lives underground and eats surface dwellers that it catches 
-D:with its poisonous tentacle, which is the only part of the creature that 
-D:is ever seen. Perhaps it is better not to see the part which remains 
-D:underground... 
-
-N:438:Fiend of Slaanesh
-G:S:R
-I:120:15d20:12:50:40
-W:28:4:0:225
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:STING:POISON:8d1
-B:STING:LOSE_STR:8d1
-B:WAIL:TERRIFY:1d4
-F:BASH_DOOR | 
-F:EVIL | DEMON | ZANGBAND
-D:Slaanesh's pet, a large scorpion-like creature with a human face and 
-D:reptile skin. 
-
 N:439:Stairway to Hell
 G:>:W
 I:120:15d8:90:40:20
@@ -6771,11 +8952,27 @@ B:WAIL:UN_BONUS
 B:WAIL:EXP_20
 B:WAIL:EAT_GOLD
 B:WAIL:EAT_ITEM
-F:CHAR_MULTI | COLD_BLOOD | EVIL | NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING |
-F:UNDEAD | FORCE_MAXHP | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | EMPTY_MIND
-F:NEVER_MOVE | JOKEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_15
-S:S_DEMON | SHRIEK
+S:SHRIEK
+S:S_DEMON
 D:Often found in graveyards. 
 
 N:440:5-headed hydra
@@ -6788,13 +8985,23 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | DROP_4D2 | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | CAN_SWIM |
-F:ANIMAL | IM_POIS | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
+S:SCARE
 D:A strange reptilian creature with five heads dripping venom. 
 
 N:441:Barney the Dinosaur
@@ -6807,13 +9014,37 @@ B:SHOW:LOSE_INT
 B:SHOW:LOSE_WIS
 B:CHARGE:EAT_GOLD
 B:CHARGE:EAT_GOLD
-F:DROP_1D2 | DROP_90 | DROP_GOOD | DROP_GREAT | ONLY_ITEM |
-F:EVIL | MALE | CAN_SPEAK | SMART | RES_TELE | CAN_SWIM | DROP_CORPSE
-F:ANIMAL | IM_POIS | FORCE_MAXHP | UNIQUE | FORCE_SLEEP
-F:MORTAL | JOKEANGBAND
+F:ANIMAL
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+F:SMART
+F:UNIQUE
 S:1_IN_3
-S:SHRIEK | CONF | S_HYDRA | SLOW | BLIND | DRAIN_MANA
-S:BA_POIS | BR_CHAO | FORGET | DARKNESS | BR_NUKE
+S:BA_POIS
+S:BLIND
+S:BR_CHAO
+S:BR_NUKE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:SHRIEK
+S:SLOW
+S:S_HYDRA
 D:The lovable purple reptile is making a guest appearance here. 
 
 N:442:Black knight
@@ -6825,12 +9056,21 @@ O:0:90:10:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:He is a figure encased in deep black plate armour; he looks at you 
 D:menacingly. 
 
@@ -6843,11 +9083,22 @@ O:0:0:0:0
 B:BITE:PARALYZE:4d5
 B:BITE:LOSE_DEX:4d5
 B:BITE:LOSE_CON:4d5
-F:FORCE_SLEEP | AQUATIC | GOOD | ANIMAL |
-F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_TOO | WILD_OCEAN 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BO_WATE | BO_COLD | BO_ICEE | BO_MANA
+F:ANIMAL
+F:AQUATIC
+F:FORCE_SLEEP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_5
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
 D:Your mind is filled with admiration as you view this wondrous, 
 D:magical seahorse. 
 
@@ -6859,12 +9110,25 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:9d9
 B:HIT:HURT:9d9
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | WILD_TOO | WILD_SHORE | WILD_MOUNTAIN |
-F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_8
 S:ARROW_4
 D:A gigantic humanoid with but one eye.  
 
@@ -6876,12 +9140,24 @@ E:1:1:1:2:1:1
 O:0:0:90:10
 B:HIT:CONFUSE:5d5
 B:HIT:TERRIFY:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | MIND_BLAST | HOLD | CAUSE_3 | FORGET | S_MONSTER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:S_MONSTER
 D:He is using his supernatural talents to bring about your 
 D:destruction. 
 
@@ -6894,9 +9170,13 @@ O:0:0:0:0
 B:HIT:HURT:1d8
 B:BITE:ACID:2d8
 B:STING:POISON:1d8
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | IM_POIS | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
 D:It is a massive worm form, many feet in length. Its vast maw drips acid 
 D:and poison. 
 
@@ -6910,10 +9190,15 @@ B:GAZE:TERRIFY:2d4
 B:GAZE:BLIND:2d4
 B:BUTT:HURT:2d6
 B:BITE:HURT:2d12
-F:ONLY_GOLD | DROP_2D2 | DROP_CORPSE
-F:BASH_DOOR | CAN_SWIM | WILD_TOO |  WILD_SWAMP |
-F:ANIMAL | IM_POIS
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:WILD_TOO
 D:A strange ox-like form with a huge head but a thin, weak neck, it looks 
 D:like the creation of some deranged alchemist. 
 
@@ -6926,9 +9211,23 @@ O:0:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | KILL_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RAND_50
 S:MULTIPLY
 D:A sentient, moving section of wall. 
 
@@ -6940,15 +9239,28 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_FIRE | BO_COLD | BO_ELEC | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:HASTE
 S:S_MONSTER
+S:TELE_TO
+S:TPORT
 D:A fat mage with glasses.  And considerable power, too - as you can 
 D:tell from the size of his hat. 
 
@@ -6960,13 +9272,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:CRUSH:LOSE_INT:2d6
 B:GAZE:INSANITY:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | HOLD | SCARE | MIND_BLAST | BRAIN_SMASH | FORGET
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:BRAIN_SMASH
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:A humanoid form with a gruesome head, tentacular mouth, and piercing 
 D:eyes. Claws reach out for you and you feel a presence invade your mind. 
 
@@ -6980,34 +9304,29 @@ B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_BODY | KILL_ITEM | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_ITEM
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:It looks like a huge spiked roller. It was designed to keep this dungeon 
 D:clean, and you are the biggest spot of dirt in sight. 
 
-N:452:Deep one
-G:u:g
-I:120:35d12:20:50:20
-W:28:5:4000:150
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:CLAW:POISON:2d4
-B:CLAW:POISON:2d4
-B:BITE:HURT:4d4
-F:FRIENDS | WILD_TOO | WILD_SHORE | DROP_CORPSE | 
-F:RAND_25 | 
-F:DROP_60 | DROP_90 |
-F:CAN_SWIM | BASH_DOOR | ELDRITCH_HORROR | RES_TELE |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE | CTHANGBAND
-D:"I thought their predominant color was a greyish-green, 
-D:though they had white bellies. They were mostly shiny and 
-D:slippery, but the ridges of their backs were scaly. Their 
-D:forms vaguely suggested the anthropoid, while their heads were 
-D:the heads of fish, with prodigious bulging eyes that never 
-D:closed. At the sides of their necks were palpitating gills and 
-D:their long paws were webbed." 
-
 N:453:Basilisk
 G:R:s
 I:120:20d30:15:90:30
@@ -7018,11 +9337,21 @@ B:GAZE:PARALYZE
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:An evil reptile that preys on unsuspecting travellers.  Its eyes stare 
 D:deeply at you and your soul starts to wilt! 
@@ -7037,30 +9366,23 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:COLD:2d6
 B:BITE:COLD:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WASTE
 D:He is a white troll with powerful clawed hands. 
 
-N:455:Dhole
-G:w:s
-I:110:65d8:14:64:25
-W:29:4:1000:555
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:SPIT:ACID:1d8
-B:ENGULF:ACID:2d8
-B:CRUSH:HURT:4d8
-F:ANIMAL | EVIL | KILL_WALL | IM_ACID | ELDRITCH_HORROR |
-F:CAN_SWIM | FORCE_MAXHP | DROP_CORPSE | 
-F:MORTAL | CTHANGBAND
-S:1_IN_6
-S:BR_ACID
-D:A gigantic worm dripping with acid. "...even as he looked, one 
-D:reared up several hundred feet and leveled a bleached, viscous end 
-D:at him." 
-
 N:456:Archangel
 G:A:B
 I:110:60d10:30:68:255
@@ -7071,13 +9393,31 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | GOOD |
-F:ONLY_ITEM | DROP_2D2 | CAN_FLY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:CONF
+S:HASTE
+S:HEAL
+S:SCARE
 D:A lesser angel protected by an aura of holiness. Its muscular form looks 
 D:extremely powerful next to your own frail body. 
 
@@ -7091,34 +9431,30 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | FORGET | 
-S:BO_ACID | BO_FIRE | BO_COLD | BO_ELEC | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_4
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
-N:458:Chaos tile
-G:.:v
-I:120:3d5:30:60:100
-W:29:6:100:200
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:HIT:POISON:3d4
-B:HIT:CONFUSE:3d4
-F:CHAR_MULTI | ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BLINK | S_MONSTER
-D:It is a floor tile corrupted by chaos. 
-
 N:459:Young blue dragon
 G:d:b
 I:110:27d10:20:50:70
@@ -7128,13 +9464,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_10
 S:BR_ELEC
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deep blue in hue. Sparks crackle along its length. 
 
@@ -7147,13 +9494,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | SUSCEP_FIRE |
-F:EVIL | DRAGON | IM_COLD | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:frosty white in hue. Icy blasts of cold air come from it as it breathes. 
 
@@ -7166,13 +9525,22 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_SWAMP |
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_POIS | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deep green in hue. Foul gas seeps through its scales. 
 
@@ -7185,32 +9553,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NO_CONF
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:rich bronze hue, and its shape masks its true form. 
 
-N:463:Aklash
-G:T:R
-I:110:30d8:14:64:25
-W:29:4:4000:300
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-B:BITE:POISON:1d20
-B:CRUSH:HURT:2d9
-F:TROLL | EVIL | FRIENDS | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:IM_POIS | IM_ACID | REGENERATE | ZANGBAND | REGENERATE | 
-S:1_IN_9 | BR_POIS
-D:Pale, bald, fat, hairless troll creatures. Ugly beyond description. 
-D:Not to mention how bad their breath smells... 
-
 N:464:Mithril golem
 G:g:B
 I:110:80d15:12:100:10
@@ -7221,10 +9582,21 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive statue of purest mithril. It looks expensive! 
 
 N:465:Skeleton troll
@@ -7236,28 +9608,21 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is a troll skeleton animated by dark dweomers. 
 
-N:466:Skeletal tyrannosaur 
-G:R:w
-I:120:50d10:20:55:20
-W:30:2:6000:225
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d8
-B:CLAW:HURT:1d8
-B:BITE:LOSE_CON:4d6
-B:GAZE:TERRIFY
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ANIMAL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-D:It is the skeleton of a tyrannosaur, animated by dark dweomers. 
-
 N:467:Beorn, the Shape-Changer
 G:q:D
 I:120:20d70:25:60:25
@@ -7268,11 +9633,24 @@ B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d8
 B:CRUSH:HURT:3d6
-F:UNIQUE | MALE | FORCE_MAXHP | FORCE_SLEEP | 
-F:BASH_DOOR | ANIMAL | MOVE_BODY | SMART | PET
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | BASEANGBAND
-S:1_IN_6 | S_ANIMAL
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_6
+S:S_ANIMAL
 D:Beorn is only occasionally seen in human form these days, preferring to 
 D:appear in the shape of a giant black bear:  he also prefers the company of 
 D:beasts to that of humans.  He has never taken kindly to strangers, even in 
@@ -7287,9 +9665,17 @@ O:0:0:0:0
 B:CLAW:HURT:16d2
 B:CLAW:HURT:16d2
 B:BITE:HURT:4d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among the mightiest of birds, Thorondor is the messenger of the Valar, and 
 D:brings news of Middle-earth to Valinor itself.  Nothing that can be seen 
 D:from the airs of the world is hidden from him. 
@@ -7301,10 +9687,14 @@ W:30:2:600:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ELEC:5d5
-F:RAND_25 | WILD_TOO | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_ELEC
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant ant that crackles with energy. 
 
 N:470:Grave wight
@@ -7316,13 +9706,26 @@ O:0:50:50:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 |
-F:ONLY_ITEM | DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:It is a ghostly form with eyes that haunt you. 
 
 N:471:Shadow drake
@@ -7334,12 +9737,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:EXP_10:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_NETH | SLOW | CONF | SCARE | DARKNESS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+S:1_IN_6
+S:BR_NETH
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in shadow.  Glowing red eyes shine in 
 D:the dark, and it is surrounded by an aura of unearthly cold that chills 
 D:the soul rather than the body. 
@@ -7354,10 +9772,16 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
 S:ARROW_4
 D:It is a winged lion's body with a human torso and a tail covered in 
 D:vicious spikes. 
@@ -7369,10 +9793,14 @@ W:30:3:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:An armoured form moving with purpose. Powerful on its own, flee when 
 D:hordes of them march. 
 
@@ -7384,8 +9812,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d8
 B:BITE:HURT:5d8
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | DROP_CORPSE
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is a beetle with deadly sharp cutting mandibles and a rock-hard 
 D:carapace. 
 
@@ -7399,33 +9833,21 @@ B:BUTT:HURT:3d9
 B:BUTT:HURT:3d9
 B:BITE:POISON:1d10
 B:KICK:HURT:2d4
-F:FORCE_SLEEP | ANIMAL | MOVE_BODY | WILD_TOO | WILD_WOOD |
-F:BASH_DOOR | IM_POIS | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_8
 S:BR_POIS
 D:A bull-like creature whose skin is made of steel plates. Watch out for 
 D:its deadly breath! 
 
-N:476:Gug
-G:P:G
-I:110:22d11:14:60:30
-W:31:2:1500:210
-E:2:0:2:4:1:1
-O:0:50:50:0
-B:BITE:HURT:10d4
-B:CLAW:HURT:2d7
-B:CLAW:HURT:2d7
-B:CLAW:HURT:2d7
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM |
-F:BASH_DOOR | OPEN_DOOR | DROP_CORPSE
-F:EVIL | IM_POIS | IM_ACID | GIANT | ZANGBAND
-D:A hideous, beastly, four-armed unclean giant: "...large as a 
-D:barrel... The eyes jutted two inches from each side, shaded by 
-D:bony protuberances overgrown of the mouth. That mouth had great 
-D:yellow fangs and ran from the top to the tally." 
-
 N:477:Ghost
 G:G:w
 I:120:13d8:20:30:10
@@ -7436,12 +9858,26 @@ B:WAIL:TERRIFY
 B:TOUCH:EXP_20
 B:CLAW:LOSE_INT:1d6
 B:CLAW:LOSE_WIS:1d6
-F:FORCE_SLEEP | RAND_25 | DROP_60 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | CAN_FLY |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:HOLD
 D:You don't believe in them. 
 
 N:478:Death watch beetle
@@ -7452,8 +9888,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d4
 B:WAIL:TERRIFY:5d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle that produces a chilling sound. 
 
 N:479:Mountain ogre
@@ -7464,10 +9905,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:The largest breed of ogre, he is awesomely strong and awesomely ugly. 
 
 N:480:Nexus quylthulg
@@ -7476,11 +9922,20 @@ I:110:10d12:10:1:0
 W:32:1:3000:300
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | RES_NEXU | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND
-S:1_IN_1 | 
-S:BLINK | TELE_AWAY
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_1
+S:BLINK
+S:TELE_AWAY
 D:It is a very unstable, strange pulsing mound of flesh. 
 
 N:481:Shelob, Spider of Darkness
@@ -7493,15 +9948,38 @@ B:CLAW:POISON:5d6
 B:CLAW:POISON:5d6
 B:BITE:PARALYZE:5d10
 B:STING:LOSE_STR:5d4
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:SMART | BASH_DOOR | IM_POIS | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | HURT_LITE | NO_SLEEP | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:TRAPS | BR_DARK | BR_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPECIAL_GENE
+F:SPIDER
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:HEAL
+S:SCARE
+S:SLOW
 S:S_SPIDER
 D:Shelob is an enormous bloated spider, the last daughter of Ungoliant the 
 D:Unlight.  Her poison is legendary, as is her ego.  She normally guards the 
@@ -7517,10 +9995,20 @@ O:0:0:0:0
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
-F:IM_ACID | RES_WATE | AQUATIC | ANIMAL | IM_COLD | MOVE_BODY
-F:FORCE_MAXHP | WILD_TOO | WILD_OCEAN | BASEANGBAND | COLD_BLOOD
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MOVE_BODY
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_8
-S:BR_ELEC | BR_ACID | BR_POIS
+S:BR_ACID
+S:BR_ELEC
+S:BR_POIS
 D:Besides being capable of dragging whole ships underwater, 
 D:this creature can also harm you with ranged attacks. 
 
@@ -7534,12 +10022,29 @@ B:CLAW:LOSE_STR:3d4
 B:CLAW:DISEASE:3d4
 B:CLAW:DISEASE:3d4
 B:BITE:PARALYZE:3d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:DROP_1D2 | FORCE_MAXHP | ESCORT | FORCE_SLEEP |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_7
-S:SCARE | HOLD | DARKNESS | SCARE | S_UNDEAD | ANIM_DEAD
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
+S:S_UNDEAD
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:484:Doombat
@@ -7551,9 +10056,15 @@ O:0:0:0:0
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
-F:WEIRD_MIND | BASH_DOOR | AURA_FIRE | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | AI_ANNOY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a fast moving creature of chaos, a gigantic black bat 
 D:surrounded by flickering bright red flames. 
 
@@ -7566,11 +10077,17 @@ O:0:100:0:0
 B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:A humanoid clothed in black who moves with blinding speed. 
 
 N:486:Memory moss
@@ -7581,11 +10098,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:CONFUSE:1d4
 B:HIT:CONFUSE:1d4
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
 S:FORGET
 D:A mass of vegetation. You don't remember seeing anything like it 
 D:before. 
@@ -7598,11 +10120,30 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_ELEC | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_COLD | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLINK | TELE_TO | CONF | SCARE | BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
+S:BA_ELEC
+S:BLINK
+S:BO_ELEC
+S:CONF
+S:SCARE
+S:TELE_TO
 D:It is a twenty-five foot tall giant wreathed in lightning. 
 
 N:488:Spectator
@@ -7614,54 +10155,25 @@ O:0:0:0:0
 B:GAZE:PARALYZE:1d4
 B:GAZE:CONFUSE:1d4
 B:BITE:HURT:1d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:STUPID | EMPTY_MIND | CAN_FLY | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
-S:1_IN_6 | 
-S:FORGET | CAUSE_2 | HOLD | SLOW
+F:CAN_FLY
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
+S:CAUSE_2
+S:FORGET
+S:HOLD
+S:SLOW
 D:A lesser relative of the beholder: a globular body with a large toothy mouth, 
 D:a large central eye, and four smaller eyes on stalks protruding from the top 
 D:of its body. 
 
-N:489:Bokrug
-G:R:v
-I:110:11d90:20:70:50
-W:33:7:0:2200
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:BITE:HURT:5d5
-B:CRUSH:HURT:2d10
-B:CRUSH:HURT:2d10
-F:UNIQUE | CAN_SPEAK |  
-F:FORCE_MAXHP | NONLIVING | NO_CONF | NO_FEAR |
-F:ESCORT | ESCORTS | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | IM_COLD | IM_POIS | DEMON | CTHANGBAND
-S:1_IN_5
-S:S_UNDEAD | MIND_BLAST | CAUSE_3 | SCARE | BO_WATE | S_KIN
-D:A lizard-like Great Old One worshipped by the men of Sarnath. 
-
-N:490:Biclops
-G:P:u
-I:120:65d20:20:90:20
-W:48:5:3000:1700
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:10d9
-B:HIT:HURT:10d9
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | DROP_CORPSE | 
-F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | 
-F:EVIL | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | GIANT | 
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:ARROW_4
-D:Oh, no! Aaargh! It is the most unnatural, most disgusting 
-D:creature imaginable: a two-eyed cyclops! This perversion 
-D:of nature must be exterminated! 
-
 N:491:Half-troll
 G:T:U
 I:110:25d14:20:50:50
@@ -7672,28 +10184,20 @@ B:CLAW:HURT:1d5
 B:CLAW:HURT:1d5
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:A huge, ugly, half-human in search of plunder. 
 
-N:492:Ivory monk
-G:p:w
-I:120:38d9:22:55:5
-W:33:1:1600:900
-E:1:1:1:2:1:1
-O:40:0:50:10
-B:KICK:HURT:8d1
-B:HIT:HURT:8d4
-B:KICK:HURT:8d1
-B:HIT:HURT:8d4
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | NO_CONF | NO_SLEEP | DROP_SKELETON |
-F:DROP_CORPSE | MALE | DROP_60 | DROP_1D2 | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:A monk trained in the most lethal martial arts. 
-
 N:493:Bert the Stone Troll
 G:T:W
 I:120:11d100:20:70:50
@@ -7703,12 +10207,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bill and Tom. 
 
@@ -7721,12 +10243,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Tom. 
 
@@ -7739,12 +10279,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Bill. 
 
@@ -7758,49 +10316,21 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:He is a vicious monster, feared for his ferocity. 
 
-N:497:Anti-paladin
-G:p:D
-I:120:30d20:30:50:30
-W:33:2:2400:450
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:HIT:HURT:2d6
-B:HIT:HURT:1d6
-B:HIT:HURT:1d6
-F:MALE | OPEN_DOOR | BASH_DOOR | TAKE_ITEM | DROP_1D2 | ONLY_ITEM |
-F:EVIL | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_4
-S:HOLD | SCARE | BLIND | CAUSE_3 | TRAPS | DARKNESS | FORGET | HASTE
-D:An embodiment of all the cardinal vices, he beholds you scornfully. 
-
-N:498:Chaos master
-G:p:v
-I:120:30d10:30:50:5
-W:37:3:2300:550
-E:1:1:1:2:1:1
-O:10:60:10:10
-B:HIT:HURT:10d2
-B:KICK:HURT:10d2
-B:PUNCH:HURT:10d2
-B:KICK:HURT:10d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL |
-F:ONLY_ITEM | DROP_1D2 | ATTR_ANY | DROP_SKELETON | DROP_CORPSE
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
-S:S_SPIDER | BA_CHAO | S_DEMON
-D:An adept of chaos, feared for his skill of invoking raw Chaos. 
-
 N:499:Barrow wight
 G:W:v
 I:110:15d10:20:40:10
@@ -7810,12 +10340,26 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:It is a ghostly nightmare of an entity. 
 
 N:500:Skeleton ettin
@@ -7828,11 +10372,20 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:BITE:HURT:1d5
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is the animated skeleton of a massive two-headed troll. 
 
 N:501:Chaos drake
@@ -7844,15 +10397,29 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:ATTR_MULTI | ATTR_ANY | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_DISE | BR_CHAO
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon twisted by the forces of chaos. It seems first ugly, then fair, 
 D:as its form shimmers and changes in front of your eyes. 
 
@@ -7865,14 +10432,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:DRAGON | EVIL | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:This dragon is clever and cunning. It laughs at your puny efforts to 
 D:disturb it. 
 
@@ -7885,15 +10466,32 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | BR_DISE | BR_CHAO
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:A mighty dragon, the balance drake seeks to maintain the Cosmic Balance, 
 D:and despises your feeble efforts to destroy evil. 
 
@@ -7906,35 +10504,28 @@ O:40:50:10:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:INVISIBLE | PASS_WALL |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+S:1_IN_6
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of great power with control over light and dark, the 
 D:ethereal drake's eyes glare with white hatred from the shadows. 
 
-N:505:Groo, the Wanderer
-G:p:U
-I:120:13d113:20:70:50
-W:35:7:5000:2000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:9d1
-B:HIT:HURT:6d5
-B:HIT:HURT:25d1
-B:HIT:HURT:6d5
-F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:DROP_CHOSEN |
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_COLD | IM_POIS | ZANGBAND
-D:He who laughs at Groo's brains will find there is nothing to laugh 
-D:about... erm, nobody laughs at Groo and lives. 
-
 N:506:Fasolt the Giant
 G:P:u
 I:110:11d111:20:70:50
@@ -7944,12 +10535,24 @@ O:0:100:0:0
 B:HIT:HURT:7d10
 B:HIT:HURT:7d10
 B:HIT:EAT_GOLD:2d10
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | IM_COLD | IM_POIS | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:Big, brawny, powerful and with a greed for gold. 
 
 N:507:Shade
@@ -7961,13 +10564,28 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A shadowy form clutches at you from the darkness. A powerful undead with 
 D:a deadly touch. 
 
@@ -7980,13 +10598,27 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A phantasmal shrieking spirit. Its wail drives the intense cold of pure 
 D:evil deep within your body. 
 
@@ -8000,11 +10632,23 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HURT:2d2
 B:HIT:HURT:2d2
-F:MALE | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | REGENERATE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_SHORE
+F:WILD_TOO
 D:He is a troll that reeks of brackish water and mud.
 
 N:510:Fire elemental
@@ -8015,12 +10659,27 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | AURA_FIRE |
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BO_FIRE
 D:It is a towering inferno of flames. 
 
@@ -8034,13 +10693,37 @@ B:HIT:HURT:4d3
 B:HIT:HURT:3d8
 B:HIT:HURT:4d3
 B:HIT:HURT:3d8
-F:FORCE_SLEEP | FORCE_MAXHP | NO_FEAR | GOOD | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | REFLECTING  | RES_TELE
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | SCARE | MIND_BLAST | BO_FIRE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_FIRE
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
 S:S_MONSTERS
 D:It is an angel moving very quickly, wielding a holy war hammer and casting 
 D:a volley of powerful spells in your direction. 
@@ -8054,12 +10737,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_6
 S:BO_COLD
 D:It is a towering tempest of water. 
 
@@ -8073,14 +10768,28 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d4
 B:BITE:HURT:4d4
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | ATTR_MULTI | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:IM_ELEC | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_ACID | BR_POIS | BR_COLD | BR_FIRE | BR_ELEC
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:Shimmering in rainbow hues, this hound is beautiful and deadly. 
 
 N:514:Invisible stalker
@@ -8092,13 +10801,22 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:RAND_50 | 
-F:RES_TELE |
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RAND_50
+F:RES_TELE
 D:It is impossible to define its form but its violence is legendary. 
 
 N:515:Carrion crawler
@@ -8109,9 +10827,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:PARALYZE:2d6
 B:STING:PARALYZE:2d6
-F:RAND_25 | FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:A hideous centipede covered in slime and with glowing tentacles around its 
 D:head. 
 
@@ -8125,12 +10848,20 @@ B:HIT:HURT:2d8
 B:HIT:HURT:3d4
 B:HIT:EAT_GOLD:4d4
 B:HIT:EAT_ITEM:4d5
-F:MALE | 
-F:DROP_90 | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_6
-S:TRAPS | ARROW_2 | BLINK
+S:ARROW_2
+S:BLINK
 D:Cool and confident, fast and lithe; protect your possessions quickly! 
 
 N:517:The Watcher in the Water
@@ -8142,11 +10873,35 @@ O:50:50:0:0
 B:CRUSH:ACID:8d8
 B:CRUSH:POISON:8d8
 B:CRUSH:PARALYZE:8d8
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | AQUATIC | ANIMAL | 
-F:IM_ACID | IM_COLD | IM_POIS | RES_WATE | RES_TELE | DROP_CORPSE | 
-F:NO_CONF | NO_FEAR | EVIL | COLD_BLOOD | BASEANGBAND | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_1D2 | SPECIAL_GENE | DROP_RANDART
-S:1_IN_5 | BA_WATE | BO_WATE | HOLD | BR_POIS | BO_ICEE | TELE_TO
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:ONLY_ITEM
+F:RES_TELE
+F:RES_WATE
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_5
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
+S:BR_POIS
+S:HOLD
+S:TELE_TO
 D:A vile creature which seems to consist mostly of tentacles, it seeks to 
 D:drag people to their doom in the water.  Few have ever escaped its grasp. 
 
@@ -8160,13 +10915,32 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d8
 B:TOUCH:LOSE_DEX:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BLIND | HOLD | SLOW | SCARE | 
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It radiates vastly evil power. 
 
 N:519:Gas spore
@@ -8176,9 +10950,14 @@ W:34:4:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:DISEASE:30d2
-F:FORCE_SLEEP |
-F:STUPID | EMPTY_MIND | CAN_FLY | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:From a distance, this creature is often mistaken for the 
 D:much more dangerous beholder. 
 
@@ -8192,14 +10971,32 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid form dressed in robes. Power emanates from its chilling 
 D:frame. 
 
@@ -8213,14 +11010,35 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | INVISIBLE | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:The oriental vampire can transform into a mist at will. 
 
 N:522:Greater mummy
@@ -8233,33 +11051,46 @@ B:CLAW:LOSE_CON:3d6
 B:CLAW:DISEASE:3d6
 B:GAZE:EXP_40:3d4
 B:GAZE:TERRIFY:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | NO_FEAR | EVIL | UNDEAD |COLD_BLOOD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_TELE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | SCARE | S_UNDEAD | ANIM_DEAD | 
-S:BA_POIS | BA_NETH | BA_COLD | DRAIN_MANA |
-S:MIND_BLAST | CAUSE_3 | DARKNESS | FORGET
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BA_POIS
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:Once a powerful ruler, now an even more powerful undead menace. 
 
-N:523:Bloodletter of Khorne
-G:U:r
-I:120:30d8:20:40:30
-W:34:1:0:450
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_20:13d1
-B:HIT:EXP_20:13d1
-B:HIT:EXP_20:13d1
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE |
-F:ONLY_ITEM | DROP_CHOSEN | NO_FEAR | NONLIVING |
-F:EVIL | IM_POIS | IM_COLD | IM_FIRE | DEMON | ZANGBAND | HAS_LITE
-D:Slender, red-skinned demons twisting in nightmarish shapes. 
-D:They are armed with hellblades, which will suck the life from 
-D:your body. 
-
 N:524:Giant grey scorpion
 G:S:s
 I:120:18d20:12:50:40
@@ -8268,9 +11099,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:STING:POISON:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON |
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant grey scorpion. It looks poisonous. 
 
 N:525:Earth elemental
@@ -8282,12 +11116,23 @@ O:0:0:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_8
 S:BO_ACID
 D:It is a towering form composed of rock with fists of awesome power. 
 
@@ -8300,12 +11145,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:CONFUSE:1d4
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_8
 S:BO_ELEC
 D:It is a towering tornado of winds. 
 
@@ -8315,10 +11172,16 @@ I:110:32d8:2:24:70
 W:27:1:0:140
 B:SPORE:ELEC:5d4
 B:SPORE:ELEC:5d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ELEC | IM_POIS | CAN_SWIM | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor, glowing and crackling with sparks. 
 
 N:528:Gargoyle
@@ -8330,12 +11193,25 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:1d6
-F:DROP_60 | ONLY_GOLD | EVIL | DEMON | FRIENDS | HURT_LITE |
-F:WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:IM_POIS | IM_FIRE | IM_COLD | IM_ELEC | HURT_ROCK | NONLIVING | 
-F:BASEANGBAND | NO_CUT
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CUT
+F:ONLY_GOLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 S:1_IN_12
-S:BR_ELEC | BR_FIRE
+S:BR_ELEC
+S:BR_FIRE
 D:A weird demon creature with a stone-like skin. 
 
 N:529:Malicious leprechaun
@@ -8346,12 +11222,21 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_1
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:MULTIPLY
+S:TELE_TO
+S:TPORT
 D:This little creature has a fiendish gleam in its eyes. 
 
 N:530:Eog golem
@@ -8364,10 +11249,21 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive deep brown statue, striding towards you with an 
 D:all-too-familiar purpose. Your magic surprisingly feels much less 
 D:powerful now. 
@@ -8379,9 +11275,24 @@ W:35:2:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:SHATTER:100d2
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:A shining machine of death and destruction. 
 
 N:532:Dagashi
@@ -8394,11 +11305,17 @@ B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:POISON:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:A human warrior, moving with lightning speed. 
 
 N:533:Headless ghost
@@ -8411,13 +11328,28 @@ B:TOUCH:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:5d5
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | DRAIN_MANA | SCARE | BO_COLD | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_COLD
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:A phantasmal apparition with no head. 
 
 N:534:Dread
@@ -8429,29 +11361,33 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_60 | DROP_2D2 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:It is a form that screams its presence against the eye. Death incarnate, 
 D:its hideous black body seems to struggle against reality as the universe 
 D:itself struggles to banish it. 
 
-N:535:Leng spider
-G:S:v
-I:120:16d20:12:50:40
-W:35:4:600:250
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:POISON:1d6
-B:STING:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | ELDRITCH_HORROR | DROP_CORPSE | 
-F:ANIMAL | SPIDER | CTHANGBAND
-D:Bloated purple spiders with long, bristly legs. 
-
 N:536:Gauth
 G:e:s
 I:110:15d20:20:50:20
@@ -8462,10 +11398,20 @@ B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_POWER:5d2
 B:GAZE:UN_POWER:5d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | EVIL | BASEANGBAND | MORTAL
-S:1_IN_5 | 
-S:CAUSE_2 | TELE_AWAY | BA_COLD | BO_ELEC | HOLD | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+S:1_IN_5
+S:BA_COLD
+S:BO_ELEC
+S:CAUSE_2
+S:DRAIN_MANA
+S:HOLD
+S:TELE_AWAY
 D:Another lesser relative of the beholder, this six-eyed creature feeds on magic. 
 
 N:537:Smoke elemental
@@ -8476,13 +11422,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:2d6
 B:ENGULF:HURT:2d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_FLY | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:DARKNESS | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BO_FIRE
+S:DARKNESS
 D:It is a towering blackened form, crackling with heat. 
 
 N:538:Olog
@@ -8495,9 +11452,18 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:HURT:2d3
 B:BITE:HURT:2d3
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE | 
-F:SMART | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:OPEN_DOOR
+F:REGENERATE
+F:SMART
+F:TROLL
 D:It is a massive troll, more intelligent than most of its kind, with needle-
 D:sharp fangs. 
 
@@ -8509,9 +11475,19 @@ E:1:1:1:2:1:1
 O:100:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_90 |
-F:SMART | EVIL | IM_POIS | IM_COLD | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 S:1_IN_3
 S:ARROW_4
 D:A rebel halfling who has rejected the halfling tradition of archery.  
@@ -8526,11 +11502,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_GRAV
 D:Unfettered by the usual constraints of gravity, these unnatural creatures 
 D:are walking on the walls and even the ceiling!  The earth suddenly feels 
@@ -8546,11 +11527,25 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | TAKE_ITEM | COLD_BLOOD | 
-F:DROP_1D2 | DROP_4D2 | CAN_SWIM |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A disgusting animated blob of destruction. Flee its gruesome hunger! 
 
 N:542:Inertia hound
@@ -8563,11 +11558,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_INER
 D:Bizarrely, this hound seems to be hardly moving at all, yet it approaches 
 D:you with deadly menace. It makes you tired just to look at it. 
@@ -8582,12 +11582,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_WALL
 D:A deep brown shape is visible before you, its canine form striking you with 
 D:an almost physical force. The dungeon floor buckles as if struck by a 
@@ -8600,10 +11604,18 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:6d6
-F:FORCE_SLEEP | RAND_50 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_4
 S:BR_SHAR
 D:A howling blast of razor-sharp mountain fragments, kept intact by perilous 
 D:magics. 
@@ -8617,13 +11629,27 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | CAN_SWIM | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_ACID
+S:BO_ACID
 D:It is a towering mass of filth, an eyesore of ooze. 
 
 N:546:Young black dragon
@@ -8635,13 +11661,21 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_SWAMP |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | 
-F:EVIL | DRAGON | IM_ACID | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:darkest black hue. Acid drips from its body. 
 
@@ -8654,8 +11688,10 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:548:Giant fire ant
@@ -8666,10 +11702,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_FIRE
+F:KILL_BODY
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws glow with heat. 
 
 N:549:Mature white dragon
@@ -8681,13 +11723,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND | 
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_9 |
-S:SCARE |
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_9
 S:BR_COLD
+S:SCARE
 D:A large dragon, scales gleaming bright white. 
 
 N:550:Xorn
@@ -8700,11 +11756,19 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A huge creature of the element Earth. Able to merge with its element, it 
 D:has four huge arms protruding from its enormous torso. 
 
@@ -8718,36 +11782,26 @@ B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:BITE:HURT:4d10
 B:SPIT:ACID:4d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
 D:A massive and cruel troll of great power, drool slides caustically down 
 D:his muscular frame. Despite his bulk, he strikes with stunning speed. 
 
-N:552:Mist giant
-G:#:B
-I:120:35d10:20:50:50
-W:36:2:0:450
-E:0:0:0:0:0:0
-O:10:90:0:0
-B:CRUSH:HURT:4d8
-B:CRUSH:HURT:4d8
-B:CRUSH:HURT:4d8
-B:BITE:EXP_40:3d9
-F:FORCE_MAXHP | OPEN_DOOR | DROP_60 | WILD_TOO | WILD_SWAMP |
-F:SMART | BASH_DOOR | 
-F:EVIL | GIANT | IM_POIS | CAN_FLY | CTHANGBAND | NO_CUT
-D:"Two eyes, the colour of a thin, yellow wine, were set high in the 
-D:thing's body; though it had no separate head. A mouthing, obscene slit, 
-D:filled with fangs lay just beneath the eyes. It had no nose or ears... 
-D:Four appendages sprang from its upper parts and its lower body 
-D:slithered along the ground, unsupported by any limbs... incredibly 
-D:disgusting to behold and its amorphous body gave off a stench of death 
-D:and decay..." 
-
 N:553:Phantom
 G:G:v
 I:120:20d25:30:30:20
@@ -8758,13 +11812,23 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:FORGET | MIND_BLAST
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_5
+S:FORGET
+S:MIND_BLAST
 D:An unholy creature of darkness, the aura emanating from this evil being 
 D:saps your very soul.
 
@@ -8777,13 +11841,26 @@ O:0:50:50:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:HOLD | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:A tangible but ghostly form, made of grey fog. The air around it feels 
 D:deathly cold. 
 
@@ -8797,13 +11874,28 @@ B:GAZE:PARALYZE
 B:CLAW:LOSE_CON:1d10
 B:CLAW:LOSE_CON:1d10
 B:GAZE:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE |
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:CONF | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:SCARE
 D:Back from the grave, to wreak vengeance upon the living. A skeletal figure 
 D:wearing a black robe, with eyes that burn with undying hatred. 
 
@@ -8816,34 +11908,35 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:3d8
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_1D2 | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_8
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:SCARE
 D:It has a form out of legend. Beautiful scales of shimmering 
 D:and magical colours cover it. 
 
-N:557:Raal's Tome of Destruction
-G:?:r
-I:120:50d15:20:150:15
-W:36:4:0:1500
-E:0:0:0:0:0:0
-O:20:0:80:0
-F:NEVER_MOVE | NEVER_BLOW | NONLIVING |
-F:FORCE_SLEEP | DROP_90 | DROP_GOOD | EVIL | COLD_BLOOD | EMPTY_MIND |
-F:FORCE_MAXHP | NO_CONF | NO_FEAR | NO_SLEEP | CHAR_MULTI |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | SUSCEP_FIRE | RES_NETH | RES_TELE | 
-F:ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2  |
-S:BO_ACID | BR_FIRE | BO_MANA | BR_COLD | BR_POIS |
-S:BO_WATE | BA_POIS | BR_NETH
-D:A sentient arcane tome casting spells with malevolent intent. 
-
 N:558:Colossus
 G:g:G
 I:110:30d100:15:150:10
@@ -8854,12 +11947,21 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NONLIVING | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
 S:1_IN_8
 S:ARROW_4
 D:An enormous construct resembling a titan made from stone. It strides 
@@ -8875,13 +11977,23 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:EVIL | DRAGON | BASEANGBAND | NO_STUN | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_STUN
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:tarnished gold hue, and light is reflected from its form. 
 
@@ -8894,14 +12006,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_ELEC
+S:SCARE
 D:A large dragon, scales tinted deep blue. 
 
 N:561:Mature green dragon
@@ -8913,14 +12036,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE | 
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_POIS
+S:SCARE
 D:A large dragon, scales tinted deep green. 
 
 N:562:Mature bronze dragon
@@ -8932,13 +12066,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_4D2 | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A large dragon with scales of rich bronze. 
 
 N:563:Young red dragon
@@ -8950,31 +12095,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:DROP_3D2 | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_10
 S:BR_FIRE
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deepest red hue. Heat radiates from its form. 
 
-N:564:Nightblade
-G:h:D
-I:120:19d13:20:60:10
-W:36:2:1600:315
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:POISON:3d4
-B:HIT:POISON:3d4
-B:HIT:LOSE_CON:3d4
-F:MALE | 
-F:DROP_1D2 | FRIENDS | INVISIBLE | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE |
-F:EVIL | NO_CONF | NO_SLEEP | ZANGBAND
-D:A dark elven assassin, so stealthy that he is almost impossible to see. 
-
 N:565:Trapper
 G:.:w
 I:120:60d10:30:75:10
@@ -8985,11 +12127,18 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:PARALYZE:15d1
 B:HIT:PARALYZE:15d1
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:INVISIBLE | EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:This creature traps unsuspecting victims 
 D:and paralyzes them, to be slowly digested later. 
 
@@ -9002,12 +12151,22 @@ O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
 B:GAZE:EXP_20
-F:FORCE_SLEEP | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_FIRE | NONLIVING |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
 F:HAS_LITE
-S:1_IN_4 | 
-S:BO_FIRE | BA_FIRE | 
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
 S:S_DEMON
 D:It is a humanoid form composed of flames and hatred. 
 
@@ -9018,10 +12177,19 @@ W:36:5:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:TIME:30d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 N:568:Mezzodaemon
@@ -9032,37 +12200,25 @@ E:1:1:1:0:1:1
 O:0:0:0:0
 B:CLAW:HURT:5d6
 B:CLAW:HURT:5d6
-F:FORCE_SLEEP | PASS_WALL | INVISIBLE |
-F:IM_POIS | IM_COLD | IM_ACID | IM_FIRE |
-F:NO_SLEEP | NO_CONF | NO_STUN | NONLIVING |
-F:EVIL | DEMON | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | DARKNESS | S_DEMON
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+S:1_IN_4
+S:BLINK
+S:DARKNESS
+S:S_DEMON
 D:An ugly demon with insect-like extremities and large bulbous eyes. 
 
-N:569:Elder thing
-G:u:G
-I:110:35d10:10:70:50
-W:36:3:0:800
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:4d6
-B:CRUSH:HURT:4d6
-B:CRUSH:HURT:4d6
-B:TOUCH:LOSE_WIS
-F:FORCE_SLEEP | OPEN_DOOR | BASH_DOOR | ELDRITCH_HORROR | NONLIVING |
-F:EVIL | DEMON | IM_POIS | IM_ACID | NO_CONF | NO_SLEEP | RES_TELE |
-F:CAN_SWIM | CTHANGBAND
-S:1_IN_4 |
-S:SCARE | TELE_AWAY | BA_NUKE | CAUSE_4 | BA_POIS |
-S:CONF | S_DEMON | S_UNDEAD
-D:"...some ridged barrel-shaped objects with thin 
-D:horizontal arms radiating spoke-like from a central ring and with 
-D:vertical knobs or bulbs projecting from the head and base of the 
-D:barrel. Each of these knobs was the hub of a system of five long, 
-D:flat, triangularly tapering arms arranged around it like the arms 
-D:of a starfish." 
-
 N:570:Ice elemental
 G:E:w
 I:110:35d10:10:60:90
@@ -9072,13 +12228,26 @@ O:0:0:0:0
 B:TOUCH:COLD:4d3
 B:HIT:HURT:4d6
 B:TOUCH:COLD:4d3
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | AURA_COLD |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_COLD | IM_ELEC | CAN_SWIM | IM_POIS | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ICEE | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BA_COLD
+S:BO_ICEE
 D:It is a towering glacier of ice. 
 
 N:571:Necromancer
@@ -9089,16 +12258,30 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BO_NETH | MIND_BLAST | FORGET |
-S:S_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HASTE
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A gaunt figure, clothed in black robes. 
 
 N:572:The Greater hell magic mushroom were-quylthulg
@@ -9111,16 +12294,54 @@ B:GAZE:EXP_40:4d8
 B:GAZE:EXP_40:4d8
 B:CRUSH:ACID:8d8
 B:CRUSH:ACID:8d8
-F:FORCE_MAXHP | FORCE_SLEEP | UNIQUE | NO_STUN | NO_CONF |
-F:NO_SLEEP| EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | 
-F:IM_COLD | RES_NETH | RES_WATE | RES_PLAS | RES_DISE | SMART |
-F:RES_NEXU | NONLIVING | RES_TELE | KILL_WALL | ELDRITCH_HORROR |
-F:BASH_DOOR | DEMON | COLD_BLOOD | ANIMAL | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_2D2 | JOKEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLINK | SLOW | SCARE | DARKNESS | HEAL | ANIM_DEAD
-S:TPORT | TELE_AWAY | HASTE | S_MONSTER | DRAIN_MANA |
-S:S_UNDEAD | S_DEMON | S_DRAGON | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ELDRITCH_HORROR
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BLINK
+S:DARKNESS
+S:DRAIN_MANA
+S:HASTE
+S:HEAL
+S:SCARE
+S:SLOW
+S:S_DEMON
+S:S_DRAGON
+S:S_KIN
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_AWAY
+S:TPORT
 D:This unholy abomination will crush you too. Flee while you can! 
 
 N:573:Lorgan, Chief of the Easterlings
@@ -9133,30 +12354,28 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | S_MONSTERS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:S_MONSTERS
+S:TELE_TO
 D:A mighty warrior from the east, Lorgan hates everything that he cannot 
 D:control. 
 
-N:574:Chaos spawn
-G:e:s
-I:110:21d21:20:50:20
-W:38:2:1900:700
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:GAZE:HURT:10d10
-B:GAZE:UN_BONUS:5d2
-B:GAZE:EXP_40:5d2
-B:GAZE:PARALYZE:5d2
-F:FORCE_MAXHP | BASH_DOOR | EVIL | CAN_FLY | ZANGBAND
-D:It has two eyestalks and a large central eye. Its gaze can kill. 
-
 N:575:Mummified troll
 G:z:w
 I:110:25d10:20:50:50
@@ -9165,11 +12384,22 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_MAXHP | 
-F:DROP_60 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:UNDEAD
 D:It is a massive figure clothed in wrappings. You are wary of its massive 
 D:fists. 
 
@@ -9181,13 +12411,23 @@ B:ENGULF:EXP_80:5d5
 B:ENGULF:UN_POWER:5d5
 B:ENGULF:UN_BONUS:5d5
 B:HIT:LOSE_ALL:5d5
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_50 | RAND_25 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_TIME | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_DISE
+S:BR_TIME
 D:Howling through the disintegrating dungeon, this awesome whirlpool of Unmagic 
 D:rips the enchantments from everything it touches. 
 
@@ -9201,67 +12441,32 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d10
 B:TOUCH:LOSE_DEX:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | RES_TELE | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TELE_LEVEL |
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It looks evil and devious... 
 
-N:578:Chaos butterfly
-G:I:G
-I:120:60d10:40:60:10
-W:37:2:0:1000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:3d7
-B:CLAW:HURT:3d7
-B:CRUSH:HURT:10d5
-F:FORCE_SLEEP | 
-F:CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | MORTAL | ZANGBAND
-S:1_IN_9
-S:BR_CONF | BR_CHAO
-D:With fractal patterns on its wings, it is clearly one of those butterflies 
-D:that mathematicians keep talking about - the ones that flap their wings on the  
-D:other side of the world to cause storms here. Now's your chance to stop it... 
-
-N:579:Time elemental
-G:E:G
-I:120:35d10:90:70:10
-W:39:2:0:1000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:TIME:3d4
-B:TOUCH:TIME:3d4
-F:PASS_WALL | IM_POIS | IM_FIRE | IM_ELEC | IM_FIRE | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | EMPTY_MIND | KILL_ITEM | RAND_50 | 
-F:ZANGBAND | NO_CUT
-S:1_IN_7
-S:SLOW | BR_TIME |
-D:You have not seen it yet. 
-
-N:580:Flying polyp
-G:~:R
-I:120:35d10:90:70:10
-W:37:2:0:1000
-E:3:0:3:6:1:0
-O:0:0:0:0
-B:CRUSH:PARALYZE:8d4
-B:CRUSH:PARALYZE:8d4
-B:CRUSH:PARALYZE:8d4
-F:PASS_WALL | INVISIBLE | FORCE_MAXHP | RES_DISE | 
-F:IM_POIS | IM_COLD | IM_ACID | ELDRITCH_HORROR |
-F:NO_CONF | NO_SLEEP | EVIL | CAN_FLY | CTHANGBAND |NO_CUT
-S:1_IN_7
-S:BR_WALL |
-D:"They were only partly material and had the power of aerial motion, 
-D:despite the absence of wings... Suggestions of monstrous plasticity 
-D:and of temporary lapses of visibility..." 
-
 N:581:The Queen Ant
 G:a:v
 I:120:15d100:30:100:10
@@ -9272,14 +12477,24 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:UNIQUE | FEMALE | GOOD | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:WEIRD_MIND | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL |
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
 S:S_KIN
 D:She's upset because you hurt her children. 
 
@@ -9293,35 +12508,36 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HALLU:1d9
 B:HIT:HALLU:1d9
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_50 | 
-F:SMART | EMPTY_MIND | INVISIBLE | 
-F:PASS_WALL | POWERFUL | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TPORT | CONF | CAUSE_2
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:RAND_50
+F:SMART
+F:WILD_TOO
+S:1_IN_2
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:TPORT
 D:A strange ball of glowing light. It disappears and reappears and seems to 
 D:draw you to it. You seem somehow compelled to stand still and watch its 
 D:strange dancing motion. 
 
-N:583:Shan
-G:I:B
-I:120:20d8:20:120:20
-W:37:4:0:250
-E:0:0:0:0:0:0
-O:0:0:0:0
-F:IM_POIS | IM_COLD | COLD_BLOOD | ANIMAL | EVIL | 
-F:NO_SLEEP | NO_CONF | CAN_FLY | NEVER_BLOW | CTHANGBAND | 
-S:1_IN_2
-S:CONF | HOLD | DRAIN_MANA | FORGET | MIND_BLAST | SHRIEK
-D:"Those huge lidless eyes which stared with hate at me, the jointed 
-D:tendrils which seemed to twist from the head in cosmic rhythms, 
-D:the ten legs, covered with black shining tentacles and folded into 
-D:the pallid underbelly, and the semi-circular ridged wings covered 
-D:with triangular scales -- all this cannot convey the soul-ripping 
-D:horror of the shape which darted at me. I saw the three mouths 
-D:of the thing move moistly, and then it was upon me." 
-
 N:584:Magma elemental
 G:E:o
 I:110:35d10:10:70:90
@@ -9331,13 +12547,27 @@ O:0:0:0:0
 B:HIT:FIRE:3d7
 B:HIT:HURT:4d6
 B:HIT:FIRE:3d7
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | AURA_FIRE | WILD_TOO | WILD_VOLCANO |
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_ELEC | IM_ACID | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_7 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_7
+S:BA_FIRE
+S:BO_PLAS
 D:It is a towering glowing form of molten rock. 
 
 N:585:Black pudding
@@ -9350,13 +12580,27 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:FRIENDS | 
-F:DROP_60 | DROP_90 | DROP_1D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A lump of rotting black flesh that slurrrrrrrps across the dungeon floor. 
 
 N:586:Killer iridescent beetle
@@ -9368,10 +12612,17 @@ O:0:0:0:0
 B:CLAW:ELEC:1d12
 B:CLAW:ELEC:1d12
 B:GAZE:PARALYZE
-F:ATTR_MULTI | FORCE_MAXHP | 
-F:WEIRD_MIND | BASH_DOOR | AURA_ELEC | DROP_CORPSE | 
-F:ANIMAL | IM_ELEC | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+F:WEIRD_MIND
 D:It is a giant beetle, whose carapace shimmers with vibrant energies. 
 
 N:587:Nexus vortex
@@ -9381,11 +12632,22 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
 S:BR_NEXU
 D:A maelstrom of potent magical energy. 
 
@@ -9397,12 +12659,25 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:4d8
 B:ENGULF:ELEC:4d8
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_50 | RAND_25 | RES_PLAS | AURA_FIRE | AURA_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_6
 S:BR_PLAS
 D:A whirlpool of intense flame, charring the stones at your feet. 
 
@@ -9415,14 +12690,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_9
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A large dragon, scales tinted deep red.
 
 N:590:Mature gold dragon
@@ -9434,13 +12723,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_SLEEP
+F:NO_STUN
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A large dragon with scales of gleaming gold. 
 
 N:591:Crystal drake
@@ -9452,14 +12753,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_3D2 | REFLECTING |
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of strange crystalline form. Light shines through it, dazzling 
 D:your eyes with spectrums of colour. 
 
@@ -9472,13 +12787,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:DROP_1D2 | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_MOUNTAIN |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_ACID
+S:SCARE
 D:A large dragon, with scales of deepest black. 
 
 N:593:Mature multi-hued dragon
@@ -9490,35 +12816,36 @@ O:50:50:0:0
 B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:4d12
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_7 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_7
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A large dragon, scales shimmering many colours. 
 
-N:594:Sky whale
-G:~:G
-I:110:80d10:20:75:30
-W:38:6:4000:1750
-E:0:0:0:0:1:0
-O:50:50:0:0
-B:CRUSH:HURT:20d2
-B:CRUSH:HURT:20d2
-B:CRUSH:HURT:20d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:BASH_DOOR | SMART | GOOD | 
-F:NO_CONF | NO_SLEEP | RES_NEXU | RES_TELE | RES_DISE
-F:MORTAL | ZANGBAND
-S:1_IN_9 | 
-S:BRAIN_SMASH | CONF | SCARE | FORGET | TELE_TO | TELE_AWAY | SHRIEK
-D:A vastly intelligent whale-like being from the stars. 
-
 N:595:Draebor, the Imp
 G:u:v
 I:120:19d99:12:80:50
@@ -9529,38 +12856,42 @@ B:CLAW:POISON:8d4
 B:CLAW:POISON:8d4
 B:BITE:HURT:8d8
 B:INSULT:*
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEMON
+F:DROP_1D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
 F:ESCORT
-F:DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | DROP_CORPSE | 
-F:CAN_SWIM | BASH_DOOR | RES_TELE | CAN_SPEAK |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE |
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | POWERFUL |
-F:NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:S_KIN | BLINK | TPORT | TELE_TO | TELE_AWAY | TELE_LEVEL | BLIND | 
-S:CONF | SCARE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+F:RES_WATE
+F:UNIQUE
+S:1_IN_5
+S:BLIND
+S:BLINK
+S:CONF
+S:SCARE
+S:S_KIN
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:An intensely irritating git of a monster. 
 
-N:596:Mother Hydra
-G:u:v
-I:120:25d99:12:80:50
-W:40:3:30000:3250
-E:0:1:0:2:2:0
-O:0:50:50:0
-B:CLAW:POISON:8d4
-B:CLAW:POISON:8d4
-B:BITE:HURT:8d8
-F:ESCORT | 
-F:DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | DROP_CORPSE | 
-F:CAN_SWIM | BASH_DOOR | ELDRITCH_HORROR | RES_TELE | CAN_SPEAK |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE |
-F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | POWERFUL |
-F:NO_CONF |
-F:MORTAL | CTHANGBAND
-S:1_IN_7 | 
-S:S_HYDRA | S_DEMON | DARKNESS | BA_WATE | BO_ACID | BA_ACID 
-D:The queen of the deep ones. "Vast, Polyphemus-like, and loathsome, it 
-D:darted like a stupendous monster of nightmares..." 
-
 N:597:Death knight
 G:p:D
 I:120:60d10:20:100:10
@@ -9570,12 +12901,25 @@ O:0:90:0:10
 B:HIT:EXP_20:6d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BO_NETH | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:SCARE
 S:S_MONSTERS
 D:It is a humanoid figure dressed in armour of an ancient form. From beneath 
 D:its helmet, eyes glow a baleful red and seem to pierce you like lances of 
@@ -9591,13 +12935,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | TAKE_ITEM | BASH_DOOR | 
-F:EVIL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | TRAPS | BO_FIRE | BO_COLD | BO_ELEC | BO_ICEE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_ICEE
+S:HEAL
 D:A Black Numenorean who usurped the throne of Gondor, he is treacherous and 
 D:evil. 
 
@@ -9608,11 +12964,19 @@ W:38:4:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:TIME:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_TIME
 D:You haven't seen it yet. 
 
@@ -9624,12 +12988,23 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:BLIND:4d4
 B:ENGULF:BLIND:4d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_LITE | SHRIEK
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_TELE
+S:1_IN_4
+S:BR_LITE
+S:SHRIEK
 D:A strange pillar of shining light that hurts your eyes. Its shape changes 
 D:constantly as it cuts through the air towards you. It is like a beacon, 
 D:waking monsters from their slumber. 
@@ -9643,14 +13018,28 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:ELEC:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A huge draconic form. Lightning crackles along its length. 
 
 N:602:Ancient bronze dragon
@@ -9662,13 +13051,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in a cascade of colour. 
 
 N:603:Beholder
@@ -9681,12 +13084,29 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_ACID | BO_FIRE | BO_COLD | BO_ELEC 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A vile creature with one huge central eye, twelve smaller eyes on stalks, and 
 D:a huge mouth filled with sharp teeth. 
 
@@ -9700,13 +13120,28 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:Your life force is torn from your body as this powerful unearthly being 
 D:approaches. 
 
@@ -9720,14 +13155,40 @@ B:HIT:HURT:4d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | NO_FEAR | GOOD | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | REFLECTING | RES_TELE
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
-S:HEAL | HASTE | TELE_AWAY | CONF | BO_MANA | BO_PLAS | 
-S:S_MONSTERS | S_ANGEL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+S:1_IN_11
+S:BO_MANA
+S:BO_PLAS
+S:CONF
+S:HASTE
+S:HEAL
+S:S_ANGEL
+S:S_MONSTERS
+S:TELE_AWAY
 D:It is an angel, fast and strong. You are stunned by its extreme holiness 
 D:and try to resist all desires to obey it. 
 
@@ -9741,14 +13202,32 @@ B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | CAN_SPEAK |
-F:EMPTY_MIND | CAN_SPEAK | MALE | AURA_FIRE |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_ELEC | NO_STUN |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SPEAK
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:RAND_25
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BO_PLAS
 D:A towering fire elemental, Vargo burns everything beyond recognition. 
 
 N:607:Black wraith
@@ -9761,68 +13240,32 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_40
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:A figure that seems made of void, its strangely human shape is cloaked in 
 D:shadow. It reaches out at you. 
 
-N:608:Nightgaunt
-G:U:D
-I:110:24d10:20:50:80
-W:38:2:0:1000
-E:0:0:0:0:0:0
-O:50:0:50:0
-B:STING:LOSE_STR:1d5
-B:TOUCH:PARALYZE:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_60 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_7 | 
-S:BLIND | CONF | BO_FIRE
-D:It is a black, horned humanoid with wings. 
-
-N:609:Baron of hell
-G:U:U
-I:110:150d12:10:130:40
-W:38:3:0:1000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:11d2
-B:CLAW:HURT:11d2
-B:CLAW:HURT:22d1
-F:IM_POIS | OPEN_DOOR | BASH_DOOR | MALE | RES_PLAS | IM_FIRE | NONLIVING |
-F:IM_FIRE | NO_CONF | NO_SLEEP | EVIL | DEMON | FORCE_MAXHP | RES_TELE | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_2 |
-S:BO_PLAS
-D:A minor demon lord with a goat's head, tough to kill. 
-
-N:610:Scylla
-G:M:B
-I:125:100d20:20:100:70
-W:42:1:15000:13000
-E:0:1:0:2:2:0
-O:0:0:0:0
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-F:FORCE_SLEEP | UNIQUE | AQUATIC | FORCE_MAXHP | COLD_BLOOD | 
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:BASH_DOOR | MOVE_BODY | EVIL | ZANGBAND | RES_WATE | 
-F:ANIMAL | IM_POIS | IM_FIRE
-S:1_IN_5 | 
-S:BR_POIS | BR_FIRE | SCARE | CONF | S_HYDRA
-D:A many-headed sea-monster, this foul creature preys on all those who 
-D:escape the clutches of Charybdis. 
-
 N:611:Monastic lich
 G:L:u
 I:120:12d100:30:80:30
@@ -9833,14 +13276,35 @@ B:KICK:HURT:24d1
 B:KICK:HURT:24d1
 B:CLAW:EXP_80:4d2
 B:CLAW:LOSE_DEX:4d2
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | ANIM_DEAD 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:TELE_TO
 D:A skeletal form wrapped in priestly robes. Before its un-death, it 
 D:was a monk in an evil order. 
 
@@ -9854,13 +13318,30 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | SCARE | CAUSE_3 | MIND_BLAST | DARKNESS | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_6
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:MIND_BLAST
+S:SCARE
 D:A form that hurts the eye, death permeates the air around it. As it nears 
 D:you, a coldness saps your soul. 
 
@@ -9873,11 +13354,21 @@ O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils.
 
 N:614:7-headed hydra
@@ -9890,13 +13381,23 @@ B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:SPIT:BLIND:1d2
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | CAN_SWIM | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
 S:BR_POIS
+S:SCARE
 D:A strange reptilian creature with seven heads dripping venom. 
 
 N:615:Waldern, King of Water
@@ -9909,14 +13410,28 @@ B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:UNIQUE | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | IM_POIS | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BO_ICEE | BO_WATE | BA_COLD | BA_WATE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:A towering water elemental, Waldern is master of all things liquid. 
 D:Wave after wave drowns your frail body. 
 
@@ -9930,15 +13445,39 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | RES_NEXU |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:BASEANGBAND | HAS_LITE |
-S:1_IN_4 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_SOUN | BR_CONF | 
-S:BR_SHAR | BR_GRAV | BR_NEXU
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_NEXU
+F:UNIQUE
+S:1_IN_4
+S:BR_ACID
+S:BR_COLD
+S:BR_CONF
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_NEXU
+S:BR_SHAR
+S:BR_SOUN
 D:A large dragon with a selection of heads, all shouting and arguing as they 
 D:look for prey, but each with its own deadly breath weapon. 
 
@@ -9951,14 +13490,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:COLD:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_FIRE
+S:1_IN_6
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:A huge draconic form. Frost covers it from head to tail. 
 
 N:618:Ancient green dragon
@@ -9970,38 +13524,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:POISON:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in clouds of poisonous vapour. 
 
-N:619:Chthonian
-G:w:D
-I:120:100d10:20:90:20
-W:39:2:12000:2300
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:SHATTER:3d11
-B:CRUSH:SHATTER:3d11
-B:TOUCH:LOSE_CON:1d2
-B:TOUCH:LOSE_CON:1d2
-F:IM_FIRE | RES_PLAS | IM_COLD | IM_POIS | ELDRITCH_HORROR | RES_TELE | 
-F:KILL_WALL | ONLY_GOLD | DROP_4D2 | DROP_2D2 | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | FORCE_MAXHP | CTHANGBAND
-S:1_IN_5 | 
-S:SCARE | CONF | HOLD | S_DEMON | 
-S:MIND_BLAST | HEAL | HASTE | FORGET | BRAIN_SMASH
-D:"Flowing tentacles and a pulpy gray-black elongated sack of a body... 
-D:no distinguishing features at all other than the reaching, groping 
-D:tentacles. Or was there -- yes! -- a lump in the upper body of 
-D:the thing... a container of sorts for the brain, ganglia, or 
-D:whichever diseased organ governed this horror's loathsome life!" 
-
 N:620:Eldrak
 G:T:r
 I:110:75d10:20:80:50
@@ -10012,10 +13558,22 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:HURT:3d4
 B:BITE:HURT:3d4
-F:FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | REGENERATE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_SHORE | WILD_WOOD |
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | DROP_CORPSE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:WILD_SHORE
+F:WILD_WOOD
 D:A massive troll of huge strength. Eldraks are extremely stupid and extremely 
 D:violent. 
 
@@ -10029,10 +13587,22 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:BITE:HURT:3d8
 B:BITE:HURT:3d8
-F:FORCE_MAXHP | REGENERATE | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_SWAMP |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A massive two-headed troll, larger and stronger than many men together. 
 D:Fortunately, ettins are solitary creatures.  They are also living proof that 
 D:two heads are not necessarily more intelligent than one... 
@@ -10047,11 +13617,21 @@ B:BITE:EXP_80:2d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:CONFUSE:6d6
-F:FORCE_MAXHP | 
-F:ONLY_GOLD | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:UNDEAD
 D:A fearsome skeletal horse with glowing eyes that watch you with little 
 D:more than a hatred of all that lives. Its flying hooves do not touch the 
 D:ground. 
@@ -10066,14 +13646,34 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_80:4d6
 B:BITE:EXP_80:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:A foul wind chills your bones as this ghastly figure approaches. 
 
 N:624:Ancient black dragon
@@ -10085,47 +13685,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:ACID:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge draconic form. Pools of acid melt the floor around it. 
 
-N:625:Weird fume
-G:#:v
-I:120:35d10:100:40:0
-W:40:2:0:800
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:CONFUSE:8d4
-B:ENGULF:CONFUSE:8d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:CAN_FLY | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_CHAO | BR_NEXU | BR_NUKE
-D:A swirling spiral of mist, constantly changing its appearance. 
-
-N:626:Spawn of Ubbo-Sathla
-G:j:v
-I:120:30d10:100:40:0
-W:40:5:0:300
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:ACID:8d4
-B:CRUSH:ACID:8d4
-F:FORCE_SLEEP | ATTR_MULTI | ATTR_ANY | EVIL |
-F:RAND_25 | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | KILL_BODY |
-F:CAN_SWIM | NO_CONF | NO_SLEEP | CTHANGBAND | NO_CUT
-S:MULTIPLY
-D:Weird, jelly like creatures. No two look the same. 
-
 N:627:Fat Man
 G:{:D
 I:120:14d14:10:80:12
@@ -10133,32 +13715,27 @@ W:40:2:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:SHATTER:200d2
-F:FORCE_SLEEP | FORCE_MAXHP |  UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT | NO_STUN
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:A shining machine of death and destruction. 
 
-N:628:Malekith the Accursed
-G:h:v
-I:125:25d100:20:70:10
-W:44:2:3500:7500
-E:1:1:1:2:1:1
-O:50:0:50:0
-B:HIT:HURT:12d9
-B:HIT:HURT:12d9
-F:MALE | REGENERATE | UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | HURT_LITE | ZANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | FORGET | HOLD |
-S:S_MONSTER | S_MONSTERS | S_DEMON | TPORT | BA_NETH | MIND_BLAST |
-S:S_KIN
-D:One of the oldest and most powerful dark elves, Malekith is a master 
-D:sorcerer devoted to evil. The left side of his face is pale, and the other 
-D:is dark. His hair is long and white. 
-
 N:629:Shadowfax, steed of Gandalf
 G:q:v
 I:130:30d100:20:100:50
@@ -10168,10 +13745,19 @@ O:0:0:0:0
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:BITE:HURT:6d6
-F:FORCE_MAXHP | UNIQUE | ANIMAL | GOOD |
-F:REGENERATE | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC |
-F:IM_POIS | NO_FEAR | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_FEAR
+F:REGENERATE
+F:UNIQUE
 D:Shadowfax is the chief of the "Mearas", the greatest of all horses that are 
 D:bred in the fields of Rohan.  Although the Mearas should technically be only 
 D:ridden by the royal family of Rohan, only Gandalf the Wizard has ever 
@@ -10187,11 +13773,19 @@ O:10:90:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:FORCE_MAXHP | 
-F:DROP_90 | 
-F:INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | TROLL | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:TROLL
 D:A weird ghostly troll-like being from the ethereal plane. 
 
 N:631:War troll
@@ -10204,10 +13798,21 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:FORCE_MAXHP | SUSCEP_FIRE | REGENERATE | 
-F:DROP_90 | REGENERATE | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:A massive troll, equipped with a scimitar and heavy armour. 
 
 N:632:Disenchanter worm mass
@@ -10217,9 +13822,17 @@ W:40:3:50:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:UN_BONUS:1d4
-F:RAND_50 | RES_DISE | ATTR_MULTI | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_50
+F:RES_DISE
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a strange mass of squirming worms. Magical energy crackles 
 D:around its disgusting form. 
@@ -10230,12 +13843,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_UNDEAD
+S:TPORT
 D:It is a pulsing flesh mound that reeks of death and putrefaction. 
 
 N:634:Lesser titan
@@ -10248,13 +13869,25 @@ B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_GOOD | DROP_4D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | SCARE | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
+S:SCARE
 S:S_MONSTERS
+S:TELE_TO
 D:It is a humanoid figure thirty feet tall that gives off an aura of power 
 D:and hate. 
 
@@ -10268,12 +13901,24 @@ B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | CAN_SWIM | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BO_FIRE
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian creature with nine smouldering heads. 
 
 N:636:Enchantress
@@ -10285,14 +13930,23 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d8
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLIND | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BLIND
 S:S_DRAGON
 D:This elusive female spellcaster has a special affinity for dragons, without
 D:whom she rarely fights.
@@ -10306,16 +13960,39 @@ O:30:50:20:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | INVISIBLE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | TAKE_ITEM | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:S_MONSTERS |  
-S:ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | BO_FIRE | BO_ELEC | BA_COLD | 
-S:HASTE | BLINK | S_ANIMALS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:BA_COLD
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:MISSILE
+S:S_ANIMALS
+S:S_MONSTERS
 D:A chieftain among the Rangers.  His understanding of nature gives him 
 D:powerful elemental spells to use against you, in addition to his skills 
 D:as an archer and a warrior.  Furthermore, he is a master of camouflage, so 
@@ -10330,16 +14007,33 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | TRAPS | 
-S:BO_ACID | BA_FIRE | BA_COLD | 
-S:S_MONSTER | S_UNDEAD | S_DRAGON
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:S_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A human figure in robes, he moves with magically improved speed, and his 
 D:hands are ablur with spell casting. 
 
@@ -10353,12 +14047,22 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_MAXHP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 |  
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:PASS_WALL
+F:SUSCEP_ACID
 D:It is a tougher relative of the Xorn. Its hide glitters with metal ores. 
 
 N:640:Giant roc
@@ -10370,9 +14074,16 @@ O:0:0:0:0
 B:CRUSH:HURT:8d12
 B:CRUSH:HURT:8d12
 B:HIT:ELEC:12d12
-F:BASH_DOOR | CAN_FLY | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | IM_ELEC | DROP_CORPSE | SUSCEP_ACID | HAS_EGG
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IM_ELEC
+F:MORTAL
+F:SUSCEP_ACID
+F:WILD_MOUNTAIN
+F:WILD_WOOD
 D:A vast legendary bird, its iron talons rake the most impenetrable of 
 D:surfaces and its screech echoes through the many winding dungeon corridors. 
 
@@ -10386,8 +14097,11 @@ B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:2d6
 B:BUTT:HURT:2d6
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
 D:It is a cross between a human and a bull. 
 
 N:642:Medusa, the Gorgon
@@ -10400,15 +14114,32 @@ B:GAZE:EXP_80
 B:GAZE:PARALYZE
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:UNIQUE | FEMALE | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_FIRE | IM_POIS |
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
-S:HOLD | SCARE | CAUSE_3 | BO_FIRE | BO_PLAS | BA_ACID | 
-S:S_HYDRA | S_KIN
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BO_FIRE
+S:BO_PLAS
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HYDRA
+S:S_KIN
 D:One of the original three ugly sisters. Her face could sink a thousand 
 D:ships. Her scales rattle as she slithers towards you, venom dripping from 
 D:her ghastly mouth. 
@@ -10422,14 +14153,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:EXP_80:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | RES_TELE
-F:INVISIBLE | TAKE_ITEM | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | RES_NETH |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:RES_TELE
+F:TAKE_ITEM
+S:1_IN_6
 S:BR_NETH
+S:CONF
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in darkness. You cannot make out its 
 D:true form but you sense its evil. 
 
@@ -10442,14 +14189,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:FIRE:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY | SUSCEP_COLD |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A huge draconic form. Wisps of smoke steam from its nostrils and the 
 D:extreme heat surrounding it makes you gasp for breath.
 
@@ -10462,13 +14224,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:HURT:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge draconic form wreathed in a nimbus of light. Its roar stuns and 
 D:deafens you. 
 
@@ -10481,39 +14257,35 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A huge crystalline dragon. Its claws could cut you to shreds and its 
 D:teeth are razor sharp. Strange colours ripple through it as it moves in 
 D:the light. 
 
-N:647:Wyrd sister
-G:p:v
-I:125:50d11:20:60:10
-W:40:4:1600:1900
-E:1:1:1:2:1:1
-O:10:0:80:0
-B:CLAW:HURT:2d6
-B:CLAW:HURT:2d6
-B:CLAW:HURT:2d8
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_SKELETON
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND
-S:1_IN_2 | 
-S:BLIND | 
-S:S_DEMON | CONF | SCARE | DARKNESS | BA_CHAO
-D:This old crone is rumoured to be a witch of chaos... but you don't 
-D:really believe in witches, do you? 
-
 N:648:Vrock
 G:U:s
 I:110:40d10:20:50:80
@@ -10523,13 +14295,22 @@ O:0:50:50:0
 B:HIT:HURT:3d4
 B:CRUSH:HURT:8d12
 B:CRUSH:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | CONF
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_8
+S:BLIND
+S:CONF
 D:It is a demon with a long neck and raking claws. 
 
 N:649:Death quasit
@@ -10541,59 +14322,35 @@ O:0:50:50:0
 B:BITE:LOSE_DEX:3d6
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_4D2 | NONLIVING |
-F:SMART | INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_10 | 
-S:BLIND | CONF | SCARE | CAUSE_3 | FORGET | 
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:FORGET
+S:SCARE
 S:S_DEMON
 D:It is a demon of small stature, but its armoured frame moves with 
 D:lightning speed and its powers make it a tornado of death and destruction. 
 
-N:650:Giganto, the Gargantuan
-G:~:s
-I:110:80d10:20:75:30
-W:38:6:8000:1750
-E:0:1:0:0:1:0
-O:60:40:0:0
-B:CRUSH:HURT:30d2
-B:CRUSH:HURT:30d2
-B:CRUSH:HURT:30d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | IM_FIRE |
-F:DROP_60 | DROP_90 | DROP_2D2 | UNIQUE | WEIRD_MIND |
-F:BASH_DOOR | SMART | EVIL | IM_COLD | DROP_CORPSE
-F:RES_WATE | WILD_OCEAN |
-F:MORTAL | ZANGBAND
-S:1_IN_9 | 
-S:BR_NUKE | BA_WATE
-D:A gargantuan mutant whale, who has grown legs that enable it to walk 
-D:on dry land as well. 
-
-N:651:Strygalldwir
-G:U:W
-I:120:12d100:90:60:10
-W:41:3:5000:8000
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:CLAW:HURT:5d5
-B:CLAW:HURT:5d5
-B:HIT:LOSE_STR:4d4
-B:TOUCH:EXP_80:8d1
-F:UNIQUE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | MOVE_BODY | NONLIVING | NO_SLEEP | NO_CONF|
-F:OPEN_DOOR | BASH_DOOR | IM_POIS | IM_COLD | DEMON | EVIL | ZANGBAND
-S:1_IN_3 |
-S:CAUSE_3 | HOLD | SCARE | BLIND | BO_ACID | S_DEMON |
-S:FORGET | BO_NETH | MIND_BLAST | DARKNESS
-D:"it was well over six feet in height, with great branches of antlers 
-D:growing out of its forehead. Nude, its flesh was a uniform ash-gray 
-D:in color. It appeared to be sexless, and it had gray, leathery wings 
-D:extending far out behind it." 
-
 N:652:Fallen angel
 G:A:s
 I:130:100d25:30:90:255
@@ -10604,32 +14361,39 @@ B:GAZE:EXP_40:4d4
 B:GAZE:EXP_40:4d4
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | EVIL | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | RES_NETH |
-F:CAN_FLY | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | 
-S:S_DEMON | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:CAUSE_2
+S:CAUSE_4
+S:SCARE
+S:S_DEMON
+S:TELE_TO
 D:An angelic being, who was mighty once, but dared defy its Creator. 
 
-N:653:Giant headless
-G:H:u
-I:110:30d12:20:50:40
-W:41:2:4000:900
-E:1:1:1:2:1:0
-O:0:100:0:0
-B:HIT:HURT:4d8
-B:HIT:HURT:4d8
-B:HIT:HURT:4d8
-F:FRIENDS | DROP_60 | DROP_90 | OPEN_DOOR | BASH_DOOR |
-F:DROP_SKELETON | DROP_CORPSE
-F:EVIL | ZANGBAND
-S:1_IN_6
-S:SCARE | BA_NUKE | BLIND
-D:Giant headless humanoid abominations created by a magical mutation. 
-
 N:654:Judge Fire
 G:s:R
 I:120:18d100:90:70:10
@@ -10640,37 +14404,47 @@ B:HIT:FIRE:5d5
 B:HIT:FIRE:5d5
 B:GAZE:EXP_80
 B:WAIL:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_COLD | IM_POIS | IM_FIRE | RES_PLAS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | HAS_LITE | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:CAUSE_3 | BO_FIRE | BA_FIRE | BR_FIRE | BO_PLAS
-S:DARKNESS | S_MONSTER | S_DEMON | S_UNDEAD | TPORT | BLINK | SCARE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_PLAS
+F:SUSCEP_COLD
+F:SUSCEP_COLD
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BLINK
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TPORT
 D:One of the Dark Judges, he has come to punish your crime of living. 
 D:He looks like a skeleton enveloped in flames. 
 
-N:655:Ubbo-Sathla, the Unbegotten Source
-G:j:W
-I:120:20d100:90:80:10
-W:41:3:0:13500
-E:0:0:0:0:0:0
-O:30:50:0:10
-B:CRUSH:ACID:5d5
-B:HIT:POISON:5d5
-B:CRUSH:ACID:5d5
-B:HIT:POISON:5d5
-F:UNIQUE | CAN_SPEAK | NO_STUN | NO_SLEEP | NO_CONF | NO_STUN |
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR | ESCORT |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | REGENERATE | SUSCEP_FIRE |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | KILL_BODY | 
-F:EVIL |  SUSCEP_FIRE | IM_COLD | IM_POIS | CTHANGBAND | NO_CUT
-D:"There, in the gray beginning of Earth, the formless mass that was 
-D:Ubbo-Sathla reposed amid the slime and the vapors. Headless, 
-D:without organs or members..." 
-
 N:656:Judge Mortis
 G:z:G
 I:120:18d100:90:70:10
@@ -10681,16 +14455,41 @@ B:HIT:POISON:5d5
 B:HIT:DISEASE:5d5
 B:TOUCH:LOSE_ALL
 B:TOUCH:EXP_80
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | SCARE | CAUSE_3 | BO_ACID | BO_NETH | BR_POIS |
-S:BR_NETH | BO_NETH | BLINK | TPORT | ANIM_DEAD
-S:BO_POIS | S_UNDEAD 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:BO_NETH
+S:BO_NETH
+S:BO_POIS
+S:BR_NETH
+S:BR_POIS
+S:CAUSE_3
+S:SCARE
+S:S_UNDEAD
+S:TPORT
 D:Another Dark Judge, he is a rotting humanoid with a cow's skull as 
 D:his head. 
 
@@ -10703,15 +14502,37 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | 
-S:BO_ACID | BA_FIRE | BA_COLD | ANIM_DEAD 
-S:S_MONSTER | S_UNDEAD | S_DEMON | MISSILE
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A dark elven figure, dressed in deepest black. Power seems to crackle 
 D:from his slender frame. 
 
@@ -10725,56 +14546,88 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d12
 B:TOUCH:LOSE_DEX:2d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
 D:A skeletal form wrapped in robes. Powerful magic crackles along its 
 D:bony fingers. 
 
-N:659:Byakhee
-G:U:D
-I:110:40d10:20:40:80
-W:41:3:1300:1500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CLAW:LOSE_STR:3d4
-B:BITE:EXP_20:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
-S:S_DEMON | CONF
-D:"There flapped rhythmically a horde of tame, trained, hybrid 
-D:winged things... not altogether crows, nor moles, nor buzzards, 
-D:nor ants, nor decomposed human beings, but something I cannot 
-D:and must not recall." 
-
 N:660:Eol, the Dark Elf
 G:h:D
 I:130:80d30:20:100:60
 W:49:2:1400:25000
 E:1:1:1:2:1:1
 O:10:40:40:10
+A:84:50
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_2D2 | DROP_GOOD | DROP_CHOSEN |
-F:SMART | IM_ELEC | IM_COLD | IM_POIS | IM_FIRE | 
-F:REFLECTING | OPEN_DOOR | BASH_DOOR | SPECIAL_GENE |
-F:HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_4 | DARKNESS | 
-S:BA_NETH | BA_ELEC | BA_ACID | BA_FIRE | BA_COLD | BO_MANA |  
-S:S_MONSTERS | S_UNDEAD | S_DRAGON | S_DEMON
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DEMON
+S:S_DRAGON
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 D:A lord of the Teleri, Eol is a mighty metalsmith, the first 
 D:one ever to forge weapons of meteorite iron.  His dark 
 D:countenance glares at you in disdain. 
@@ -10789,61 +14642,40 @@ B:GAZE:TERRIFY:4d4
 B:GAZE:TERRIFY:4d4
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | GOOD | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | CAN_FLY 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | BO_MANA | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_MANA
+S:CAUSE_2
+S:CAUSE_4
+S:SCARE
 S:S_ANGEL
+S:TELE_TO
 D:Never a more heavenly being have you seen. The very holiness of its 
 D:presence makes you deeply respect it. Few creatures can match the powers 
 D:of an Archon; fewer still live to tell the tale after attacking one. 
 
-N:662:Formless spawn of Tsathoggua
-G:U:D
-I:110:22d20:20:40:80
-W:41:2:0:1850
-E:0:0:0:0:0:0
-O:35:45:0:10
-B:HIT:ACID:2d4
-B:HIT:ACID:2d4
-B:CRUSH:HURT:3d4
-B:BITE:ACID:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR | NONLIVING |
-F:ONLY_ITEM | DROP_90 | REGENERATE | RES_TELE | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_SWIM |
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | SUSCEP_FIRE | IM_POIS | CTHANGBAND | NO_CUT
-S:1_IN_9 | 
-S:BO_FIRE | BO_ACID | 
-S:S_DEMON | MIND_BLAST | DARKNESS | 
-D:"...living things that oozed along stone channels... 
-D:But they were not toads like Tsathoggua himself. Far worse -- 
-D:they were amorphous lumps of viscous black slime that took 
-D:temporary shapes for various purposes." 
-
-N:663:Hunting horror
-G:U:D
-I:110:30d17:20:90:80
-W:42:2:0:2300
-E:0:0:0:0:0:0
-O:45:35:0:10
-B:BITE:LOSE_DEX:1d3
-B:BITE:POISON:1d3
-B:CRUSH:HURT:9d4
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | HURT_LITE | IM_POIS | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_9 |
-S:BLIND | CONF | S_DEMON | BR_DARK
-D:"And in the air there were great viperine creatures, 
-D:which had curiously distorted heads, and grotesquely great 
-D:clawed appendages, supporting themselves with ease by the aid 
-D:of black rubbery wings of singularly monstrous dimensions." 
-
 N:664:Undead beholder
 G:e:u
 I:120:27d100:30:100:10
@@ -10854,15 +14686,36 @@ B:GAZE:EXP_40:3d6
 B:GAZE:UN_POWER:3d6
 B:GAZE:INSANITY:3d6
 B:BITE:EXP_40:7d6
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:SLOW | CONF | CAUSE_4 | DRAIN_MANA | MIND_BLAST | FORGET | 
-S:BO_MANA | BO_NETH | BRAIN_SMASH | BA_FIRE | BA_COLD | BO_ACID |
-S:S_UNDEAD | ANIM_DEAD 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_TELE
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BO_ACID
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A beholder which has cheated death.  Black nether storms rage around the 
 D:bloodshot pupil of its central giant eye, and light seems to bend as it 
 D:sucks its power from the very air around it.  Your soul chills as it drains 
@@ -10878,13 +14731,28 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | POWERFUL | REGENERATE | HURT_LITE |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | RES_NETH |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_8 | 
-S:BO_NETH | TELE_TO | SLOW
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:UNDEAD
+S:1_IN_8
+S:BO_NETH
+S:SLOW
+S:TELE_TO
 D:A mighty spirit of darkness of vaguely humanoid form. Razor-edged claws 
 D:reach out to end your life as it glides towards you, seeking to suck the 
 D:energy from your soul to feed its power. 
@@ -10898,15 +14766,38 @@ O:0:0:100:0
 B:BUTT:COLD:3d6
 B:BUTT:FIRE:3d6
 B:BUTT:ELEC:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING |
-F:COLD_BLOOD | BASH_DOOR | CAN_FLY | SUSCEP_ACID |
-F:EVIL | UNDEAD | POWERFUL | SMART |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_GOOD |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 |
-S:BA_WATE | BA_FIRE | BO_ICEE | BA_ELEC | BA_COLD |
-S:CAUSE_4 | DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SUSCEP_ACID
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_WATE
+S:BO_ICEE
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_UNDEAD
 D:It is a huge, twisted grey skull floating through the air. Its cold eyes 
 D:burn with hatred towards all who live. 
 
@@ -10919,14 +14810,29 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | 
-F:RAND_25 | FRIENDS | CAN_FLY |
-F:ONLY_ITEM | DROP_60 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:It is a form that screams its presence against the eye. Death incarnate, 
 D:its hideous black body seems to struggle against reality as the universe 
 D:itself struggles to banish it. 
@@ -10941,90 +14847,26 @@ B:GAZE:PARALYZE:3d12
 B:GAZE:PARALYZE:3d12
 B:BITE:POISON:2d12
 B:BITE:POISON:2d12
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
 S:1_IN_8
-S:BR_POIS | BR_DARK | BR_NEXU
+S:BR_DARK
+S:BR_NEXU
+S:BR_POIS
 D:A large basilisk, whose shape resembles that of a great wyrm. 
 
-N:669:Charybdis
-G:~:r
-I:120:20d100:20:100:70
-W:42:1:15000:13000
-E:0:0:0:0:1:0
-O:50:50:0:0
-B:ENGULF:HURT:10d8
-B:ENGULF:HURT:10d8
-B:ENGULF:HURT:10d8
-F:AQUATIC | EVIL | UNIQUE |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:SMART | POWERFUL | MOVE_BODY | NEVER_MOVE |
-F:IM_ACID | IM_FIRE | IM_COLD | RES_WATE | COLD_BLOOD | 
-F:IM_ELEC | IM_POIS | NO_STUN | ZANGBAND
-S:1_IN_5 | 
-S:BA_WATE 
-D:A monstrous dweller of the depths; its hungry maw has been the doom 
-D:of innumerable sailors! 
-
-N:670:Jack of Shadows
-G:p:s
-I:150:30d100:70:150:4
-W:60:4:2300:10000
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:HIT:HURT:5d10
-B:HIT:HURT:5d10
-B:HIT:EAT_ITEM:2d10
-B:HIT:EAT_ITEM:2d10
-F:MALE | FORCE_MAXHP | CAN_SPEAK | REFLECTING | DROP_SKELETON | DROP_CORPSE | 
-F:REGENERATE |
-F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS | RES_TELE |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_GREAT | UNIQUE |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL |
-F:MORTAL | ZANGBAND
-S:1_IN_3
-S:BLIND | HEAL | BA_DARK | HASTE | CONF |
-D:Deriving his strength from the shadows, this king of thieves 
-D:steals only for the challenge. 
-
-N:671:Zephyr Lord
-G:W:v
-I:130:80d10:20:70:10
-W:43:2:600:3000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_20:8d2
-B:HIT:LOSE_STR:8d2
-B:HIT:LOSE_CON:8d2
-F:MALE | ATTR_MULTI | UNDEAD | EVIL | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS |
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:NO_STUN | NO_CONF | NO_SLEEP | ZANGBAND | NO_CUT
-S:1_IN_5 | 
-S:SHRIEK | S_HOUND
-D:An undead master of the vicious Zephyr hounds. 
-
-N:672:Juggernaut of Khorne
-G:g:D
-I:120:90d19:12:90:10
-W:43:3:6000:2500
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BUTT:HURT:6d6
-B:CRUSH:HURT:8d6
-B:CRUSH:HURT:8d6
-B:BUTT:HURT:6d6
-F:COLD_BLOOD | BASH_DOOR | REFLECTING | KILL_ITEM |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | NO_CUT
-D:A great, vicious beast whose flesh is made of steel and whose 
-D:blood is fire. It charges at you ignoring everything else. 
-
 N:673:Mumak
 G:q:s
 I:110:90d10:20:55:100
@@ -11034,8 +14876,11 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:FRIENDS | DROP_CORPSE | 
-F:BASH_DOOR | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:674:Judge Fear
@@ -11048,15 +14893,40 @@ B:GAZE:TERRIFY
 B:GAZE:EXP_40
 B:GAZE:EXP_40
 B:GAZE:HURT:2d20
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | MIND_BLAST | BRAIN_SMASH | 
-S:S_UNDEAD | DRAIN_MANA | FORGET | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:A Dark Judge, reputedly so frightening that his gaze can kill. 
 
 N:675:Ancient multi-hued dragon
@@ -11068,15 +14938,39 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form. Many colours ripple down its massive frame. Few 
 D:live to see another. 
 
@@ -11089,62 +14983,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:INVISIBLE | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_6
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:A huge dragon emanating from the ethereal plane, this terrible creature is 
 D:a master of light and dark. Its form disappears from sight as it cloaks 
 D:itself in unearthly shadows. 
 
-N:677:Dark young of Shub-Niggurath
-G:U:g
-I:120:12d100:20:75:80
-W:43:2:0:5000
-E:0:0:0:0:0:0
-O:0:40:30:20
-B:CRUSH:HURT:5d6
-B:CRUSH:HURT:5d6
-B:BITE:LOSE_STR:1d6
-B:BITE:LOSE_STR:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 | NONLIVING | CAN_SWIM |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | HURT_LITE |
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | RES_TELE | CTHANGBAND
-S:1_IN_9 | 
-S:BLIND | CAUSE_2 | 
-S:S_DEMON | HEAL 
-D:"Something black in the road, something that wasn't a tree. 
-D:Something big and black and ropy, just squatting there, waiting, 
-D:with ropy arms squirming and reaching... It came crawling up the 
-D:hillside... and it was the black thing of my dreams... that black, 
-D:ropy, slimy jelly tree-thing out of the woods. It crawled up and it 
-D:flowed up on its hoofs and mouths and snaky arms." 
-
-N:678:Colour out of space
-G:.:v
-I:120:12d100:20:100:10
-W:43:2:0:8000
-E:0:0:0:0:0:0
-O:35:35:10:10
-B:TOUCH:LOSE_ALL:7d6
-B:TOUCH:LOSE_ALL:7d6
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | 
-F:INVISIBLE | PASS_WALL | CAN_FLY | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | ATTR_MULTI | ATTR_ANY |
-F:CHAR_CLEAR | SMART | COLD_BLOOD | EVIL | 
-F:IM_COLD | IM_FIRE | IM_ACID | IM_ELEC | IM_POIS |
-F:NO_STUN | NO_CONF | NO_SLEEP | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_9 | 
-S:DRAIN_MANA | BR_DISE | BR_NETH | TPORT
-D:"The shaft of phosphorescence from the well... was no longer shining 
-D:out, it was pouring out; and as the shapeless stream of unplaceable 
-D:colour left the well it seemed to flow directly into the sky." 
-
 N:679:Quaker, Master of Earth
 G:E:u
 I:110:28d100:10:97:90
@@ -11155,147 +15017,34 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:SHATTER:10d10
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | KILL_WALL | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_6 | 
-S:BO_ACID | BA_ACID
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:KILL_WALL
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+F:POWERFUL
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
 D:A towering stone elemental stands before you. The walls and ceiling are 
 D:reduced to rubble as Quaker advances. 
 
-N:680:Death leprechaun
-G:h:D
-I:120:6d6:8:13:8
-W:44:6:0:85
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:TOUCH:EXP_40:1d10
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD | SMART |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | UNDEAD | RES_NETH | ZANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_3 | ANIM_DEAD
-D:Nasty undead little creatures. They are chanting the name of the 
-D:sinister wizard who created them: 'Bruce! Bruce..!' 
-
-N:681:Chaugnar Faugn, Horror from the Hills
-G:q:D
-I:110:20d100:10:125:90
-W:44:4:0:6250
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-B:BITE:LOSE_CON:8d2
-B:BITE:LOSE_CON:8d1
-F:UNIQUE | CAN_SPEAK | EVIL | DEMON | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE |
-F:ELDRITCH_HORROR | POWERFUL |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_FEAR | CTHANGBAND
-S:1_IN_6 | 
-S:HOLD | CAUSE_4 | CONF | SCARE | FORGET | BRAIN_SMASH |
-S:MIND_BLAST | CAUSE_3 | S_DEMON | S_MONSTERS
-D:"The ears were webbed and tentacled, the trunk terminated in 
-D:a huge flaring disk at least a foot in diameter... Its forelimbs 
-D:were bent stiffly at the elbow, and its hands... rested palms 
-D:upward on its lap." 
-
-N:682:Lloigor
-G:v:B
-I:120:100d15:20:100:20
-W:44:2:0:6000
-E:0:0:0:0:0:0
-O:90:0:10:0
-B:ENGULF:LOSE_CON:4d10
-B:ENGULF:LOSE_CON:4d10
-B:ENGULF:LOSE_CON:4d10
-F:FORCE_SLEEP | ELDRITCH_HORROR | PASS_WALL | 
-F:INVISIBLE | DROP_2D2 | DROP_4D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL |
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS |
-F:MORTAL | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_WALL | TELE_AWAY | BR_GRAV |
-S:S_KIN | MIND_BLAST | BLIND | BLINK  
-D:"Invisible ones from the stars... They sometimes took forms... 
-D:but existed as vortices of power in their natural state." 
-
-N:683:Utgard-Loke
-G:P:v
-I:120:40d100:30:125:15
-W:44:3:0:13500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-F:ESCORT | UNIQUE | IM_COLD | AURA_COLD | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | 
-S:S_KIN | BR_COLD 
-D:A frost giant chieftain, unusually smart for a giant. 
-
-N:684:Quachil Uttaus, Treader of the Dust
-G:z:D
-I:120:50d66:30:80:15
-W:44:3:0:20000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:CLAW:HURT:50d1
-B:TOUCH:TIME:1d50
-B:TOUCH:TIME:1d50
-F:ESCORT | UNIQUE | IM_COLD | ELDRITCH_HORROR | RES_NETH |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | KILL_BODY | DROP_GREAT |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | NO_SLEEP | NO_CONF
-F:EVIL | UNDEAD | DEMON | REGENERATE | CTHANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BR_TIME | SLOW | HASTE | HEAL 
-D:"It was a figure no larger than a young child, but severe and 
-D:shriveled as some millenial mummy. Its hairless head, its 
-D:unfeatured face, borne on a neck of skeleton thinness, were 
-D:lined with a thousand reticulated wrinkles. The body was like 
-D:that of some monstrous, withered abortion that had never drawn 
-D:breath. The pipelike arms, ending in bony claws, were outhrust as if 
-D:enclosed in a posture of an eternal dreadful grasping." 
-
-N:685:Shoggoth
-G:j:D
-I:140:50d20:20:80:20
-W:44:2:0:2500
-E:0:0:0:0:0:0
-O:30:70:0:0
-B:CRUSH:ACID:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:HURT:9d9
-F:REGENERATE | ONLY_ITEM | KILL_ITEM | DROP_2D2 | DROP_90 | DROP_60
-F:BASH_DOOR | EVIL | NO_CONF | NO_SLEEP | KILL_BODY | CAN_SWIM |
-F:FORCE_MAXHP | FORCE_SLEEP | HURT_LITE | POWERFUL |
-F:IM_ACID | IM_FIRE | RES_PLAS | IM_POIS | IM_COLD | IM_ELEC | RES_TELE
-F:CTHANGBAND | HAS_LITE | NO_CUT
-D:"The nightmare, plastic column of fetid, black iridescence oozed 
-D:tightly onward... A shapeless congerie of protoplasmic bubbles, 
-D:faintly self-luminous and with myriads of temporary eyes forming 
-D:and unforming as pustules of greenish light all over the 
-D:tunnel-filling front that bore down upon us, crushing the frantic 
-D:penguins and slithering over glistening floor that it and its 
-D:kind had swept so evilly free of all litter. Still came that eldritch 
-D:mocking cry -- 'Tekeli-li! Tekeli-li!'" 
-
 N:686:Judge Death
 G:W:D
 I:120:45d50:90:90:10
@@ -11306,15 +15055,41 @@ B:CLAW:POISON:10d5
 B:CLAW:POISON:10d5
 B:CLAW:EXP_40:10d1
 B:GAZE:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ELEC | IM_COLD | SUSCEP_FIRE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_4 | BA_FIRE | BA_NETH | ANIM_DEAD 
-S:S_MONSTERS | S_UNDEAD | S_HI_UNDEAD | DRAIN_MANA | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNDEAD
 D:The most powerful Dark Judge, whose touch means death. 
 
 N:687:Ariel, Queen of Air
@@ -11327,15 +15102,32 @@ B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
 B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
-F:UNIQUE | FEMALE | AURA_ELEC | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ELEC | BA_COLD | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:UNIQUE
+S:1_IN_5
+S:BA_COLD
+S:BA_ELEC
+S:BO_ELEC
 D:A towering air elemental, Ariel the sorceress avoids your blows 
 D:with her extreme speed. 
 
@@ -11349,13 +15141,26 @@ B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BO_PLAS | BA_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian hybrid with eleven smouldering heads. 
 
 N:689:Patriarch
@@ -11367,15 +15172,30 @@ O:0:10:90:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CAUSE_4 | CAUSE_3 | ANIM_DEAD | 
-S:S_MONSTERS | S_UNDEAD
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HEAL
+S:HOLD
+S:S_MONSTERS
+S:S_UNDEAD
 D:An evil priest, dressed all in black.  Deadly spells hit you at an 
 D:alarming rate as his black spiked mace rains down blow after blow on your 
 D:pitiful frame. 
@@ -11390,14 +15210,34 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | CAN_FLY |
-F:SMART | TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_9 | 
-S:TELE_LEVEL | BLIND | HOLD | CONF | CAUSE_4 | DRAIN_MANA | BO_NETH | 
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_9
+S:BLIND
+S:BO_NETH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 S:S_UNDEAD
+S:TELE_LEVEL
 D:It is an unlife of power almost unequalled. An affront to existence, its 
 D:very touch abuses and disrupts the flow of life, and its unearthly limbs, 
 D:of purest black, crush rock and flesh with ease. 
@@ -11412,15 +15252,31 @@ B:CLAW:HURT:3d10
 B:CLAW:HURT:3d10
 B:BITE:POISON:5d10
 B:BITE:POISON:5d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:DRAGON | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | SLOW | CONF | ARROW_3 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DRAGON
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_6
+S:ARROW_3
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SLOW
 D:A constructed dragon, the drolem has massive strength. Powerful spells 
 D:weaved during its creation make it a fearsome adversary. Its eyes show 
 D:little intelligence, but it has been instructed to destroy all it meets. 
@@ -11435,34 +15291,33 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:COLD:4d14
 B:BITE:COLD:4d14
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CORPSE
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_4
 S:BR_COLD
+S:CAUSE_3
+S:CONF
 D:An ancient and wise dragon, Scatha has grown clever over the long years. 
 D:His scales are covered with frost, and his breath sends a shower of ice 
 D:into the air. 
 
-N:693:Warrior of the Dawn
-G:p:R
-I:120:25d25:20:70:20
-W:45:2:1600:500
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:5d5
-B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR |
-F:FRIENDS |
-F:MALE | OPEN_DOOR | BASH_DOOR | ZANGBAND | HAS_LITE
-D:Fierce, barbaric warriors, armed with great spiked clubs, and surrounded 
-D:in an aura of scarlet. Whenever one of them is slain, another appears 
-D:out of nowhere to take his place. 
-
 N:694:Lesser black reaver
 G:L:D
 I:120:25d100:20:120:50
@@ -11473,45 +15328,38 @@ B:HIT:UN_BONUS:4d8
 B:HIT:UN_BONUS:4d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM  | DROP_2D2 | DROP_GOOD | CAN_SWIM |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | DRAIN_MANA | 
-S:MIND_BLAST | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:TELE_TO
 D:A humanoid form, black as night, advancing steadily and unstoppably. 
 
-N:695:Zoth-Ommog
-G:R:v
-I:120:25d100:12:50:50
-W:45:4:0:18000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:25d3
-B:CRUSH:HURT:25d3
-B:BITE:LOSE_DEX:2d10
-B:BITE:LOSE_CON:2d10
-F:UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | CAN_SWIM | ELDRITCH_HORROR |
-F:KILL_ITEM |  BASH_DOOR | POWERFUL | 
-F:EVIL | IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_FEAR | CTHANGBAND
-S:1_IN_5 | 
-S:S_MONSTER | SCARE | CAUSE_4 | S_HYDRA | S_SPIDER | 
-S:BA_NETH | BA_POIS | BA_ACID | CAUSE_3 | HOLD | MIND_BLAST
-D:"A body shaped like a road-based, truncated cone. A flat, blunt, 
-D:wedge-shaped, vaguely reptilian head surmounts this conical torso, 
-D:and the head is almost entirely hidden behind swirling tresses. 
-D:This hair, or beard and mane, consists of thickly carved and 
-D:coiling ropes, like serpents or worms... Through this repulsive 
-D:Medusa-mane of ropy tendrils, two fierce, serpent-like eyes 
-D:glare in a horrible intermingling of cold, inhuman mockery and 
-D:what I can only describe as gloating menace." 
-
 N:696:Grand master thief
 G:p:b
 I:130:15d100:50:75:40
@@ -11522,11 +15370,18 @@ B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_GOLD:5d5
 B:HIT:EAT_GOLD:5d5
-F:MALE | DROP_2D2 |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | BASEANGBAND
-S:1_IN_2 |
-S:BLINK | TPORT | TELE_TO | CONF | TRAPS | ARROW_2
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_2
+S:BLINK
+S:CONF
+S:TELE_TO
+S:TPORT
 D:A class of its own: you are already too late to protect your possessions - 
 D:and he seems to have studied magic too, and is a master of setting traps. 
 
@@ -11540,38 +15395,37 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:5d14
 B:BITE:FIRE:5d14
-F:UNIQUE | MALE | REFLECTING | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_FIRE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SMART
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:Smaug is one of the Uruloki that still survive, a fire-drake of immense 
 D:cunning and intelligence.  His speed through air is matched by few other 
 D:dragons, his dragonfire is legendary, and his hide is 
 D:armoured with diamonds. He is believed to be the greatest dragon still 
 D:surviving into the Third Age. 
 
-N:698:The Stormbringer
-G:|:D
-I:120:13d123:20:99:20
-W:45:2:0:13333
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:WAIL:TERRIFY
-B:HIT:EXP_80:64d1
-B:HIT:EXP_80:64d1
-B:HIT:EXP_80:8d8
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_NETH |
-F:FORCE_SLEEP | UNIQUE | FORCE_MAXHP | CAN_FLY |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | HAS_LITE | NO_CUT | NO_STUN
-D:The mightiest of hellblades, a black runesword which thirsts for 
-D:your soul. 
-
 N:699:Knight Templar
 G:p:w
 I:120:60d20:20:60:10
@@ -11581,14 +15435,39 @@ O:0:100:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD | GOOD |
-F:RES_NETH | RES_NEXU | RES_DISE | RES_TELE | DROP_SKELETON | DROP_CORPSE
-F:NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN | 
-F:DROP_2D2 | DROP_90 | REFLECTING |
-F:MALE | OPEN_DOOR | BASH_DOOR | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_3 | CAUSE_4 | HASTE | SCARE | BLIND | S_ANGEL
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANGEL
 D:It seems that the more devout the person, the more likely they are to cross 
 D:the boundary between piety and sanctimoniousness.  And such is the case with 
 D:the Order of the Knights Templar; they are among the most pious and 
@@ -11596,22 +15475,6 @@ D:powerful of the religious knightly orders, but noted for their intolerance.
 D:Thus it is Morgoth's will that is unwittingly done, as the forces of good 
 D:are set against each other. 
 
-N:700:Leprechaun fanatic
-G:h:r
-I:123:6d6:8:13:8
-W:46:6:800:80
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:EXPLODE:HURT:20d3
-F:RAND_25 | TAKE_ITEM | SMART |
-F:EVIL | OPEN_DOOR | MALE |
-F:MORTAL | ZANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO  
-D:These leprechauns are not afraid to die for their cause. They are 
-D:carrying explosives and making terrorist strikes... 
-
 N:701:Dracolich
 G:D:G
 I:120:35d100:25:120:80
@@ -11621,15 +15484,33 @@ O:10:50:40:0
 B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:EXP_80:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | RES_TELE | 
-F:COLD_BLOOD | CAN_FLY |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:CONF | SCARE | 
-S:BR_COLD | BR_NETH
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DRAGON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_6
+S:BR_COLD
+S:BR_NETH
+S:CONF
+S:SCARE
 D:The skeletal form of a once-great dragon, enchanted by magic most 
 D:perilous. Its animated form strikes with speed and drains life from its 
 D:prey to satisfy its hunger. 
@@ -11644,13 +15525,27 @@ B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_1D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
 S:S_MONSTERS
+S:TELE_TO
 D:A forty foot tall humanoid that shakes the ground as it walks. The power 
 D:radiating from its frame shakes your courage, its hatred inspired by your 
 D:defiance. 
@@ -11665,14 +15560,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:7d14
 B:GAZE:PARALYZE
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_TELE | 
-F:ANIMAL | EVIL | DRAGON | IM_ACID | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:HOLD | SCARE | 
-S:BR_FIRE | BR_NEXU
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
+S:BR_FIRE
+S:BR_NEXU
+S:HOLD
+S:SCARE
 D:A mixture of dragon and basilisk, the dracolisk stares at you with deep 
 D:piercing eyes, its evil breath burning the ground where it stands. 
 
@@ -11684,81 +15595,25 @@ B:CLAW:HURT:3d8
 B:CLAW:HURT:3d8
 B:BITE:EXP_40:4d6
 B:BITE:EXP_40:4d6
-F:ANIMAL | MORTAL | EVIL | CAN_FLY | BASH_DOOR | IM_COLD | IM_POIS
-F:WILD_TOO | WILD_WASTE | WILD_WOOD | WILD_SWAMP | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 S:1_IN_6
-S:BR_NETH | BR_DARK | BR_POIS
+S:BR_DARK
+S:BR_NETH
+S:BR_POIS
 D:A terrifying sight:  a winged creature greater than any bird you have ever 
 D:seen, and with no feathers on its horrid black leathery wings.  Descended 
 D:from a creature of an older world perhaps, bred by Sauron to be a winged 
 D:steed for his Ringwraiths. 
 
-N:705:Spectral tyrannosaur
-G:R:G
-I:120:70d50:25:120:30
-W:46:3:0:15000
-E:0:0:0:0:0:0
-O:20:20:20:20
-B:BITE:EXP_40:2d13
-B:BITE:EXP_40:2d13
-B:BITE:LOSE_STR:5d8
-B:GAZE:TERRIFY
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:EVIL | UNDEAD | ANIMAL | RES_NEXU | RES_TELE
-F:NO_CONF | NO_FEAR | NO_SLEEP | 
-F:IM_POIS | IM_ACID | IM_COLD |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | ZANGBAND | NO_CUT
-S:1_IN_6 | 
-S:HOLD | SCARE | 
-S:BR_NEXU | BR_POIS | BR_NETH
-D:A deadly undead horror which looks like a skeletal tyrannosaur 
-D:surrounded by a sickly green glow. 
-
-N:706:Yibb-Tstll, the Patient One
-G:P:D
-I:120:99d21:20:100:20
-W:46:2:0:16000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:1d166
-B:TOUCH:LOSE_ALL:1d166
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | 
-F:ELDRITCH_HORROR | NEVER_MOVE | REGENERATE | POWERFUL | 
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | ONLY_ITEM | 
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | CTHANGBAND
-S:1_IN_4 | 
-S:BR_NUKE | S_DEMON | DARKNESS | S_UNDEAD | ANIM_DEAD 
-S:BR_NEXU | BR_CHAO
-D:"There, about the pulsating body of the Ancient One, hugely 
-D:winged reptilian creatures without faces cluttered and clutched 
-D:at a multitude of blackly writhing, pendulous breasts! Its eyes 
-D:moved quickly, independently -- sliding with vile viscosity over 
-D:the whole rotten surface of Yib-Tstll's pulpy, glistening head!" 
-
-N:707:Ghatanothoa
-G:v:D
-I:120:100d20:20:100:20
-W:46:2:0:16000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CLAW:LOSE_INT:5d10
-B:CLAW:LOSE_WIS:5d10
-B:BITE:CONFUSE:5d10
-F:FORCE_SLEEP | ELDRITCH_HORROR | PASS_WALL | UNIQUE |
-F:INVISIBLE | DROP_2D2 | DROP_4D2 | CAN_FLY | DROP_GOOD | ONLY_ITEM |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL | NO_CONF | NO_SLEEP |
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | 
-F:MORTAL | CTHANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BR_WALL | TELE_AWAY | BR_GRAV | TELE_LEVEL | S_DEMON | S_UNDEAD | S_KIN | 
-S:BRAIN_SMASH | HASTE | BLIND | BLINK | BR_INER | CAUSE_3 | CAUSE_4
-D:The chief among the creatures known as Lloigor. Ghatanothoa, unlike most of 
-D:his kind, has assumed a shape, and one which is too horrible to describe:  
-D:"Nothing I could say could even adumbrate the loathsome, unholy, non-human, 
-D:extra-galactic horror and hatefulness and unutterable evil of that forbidden 
-D:spawn of black chaos, and illimitable night." 
-
 N:708:Ent
 G:#:G
 I:110:40d100:30:120:15
@@ -11769,10 +15624,20 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | PET | SUSCEP_FIRE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
 D:A tree-herd: a sentient, moving tree. Its wrath is fearsome, and it could 
 D:split stones and even the very rock of Isengard with its roots. 
 
@@ -11786,10 +15651,22 @@ B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | HURT_ROCK |
-F:ONLY_GOLD | DROP_4D2 | MOVE_BODY | KILL_WALL |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
 D:A rock giant, a being made of living stone. 
 
 N:710:Itangast the Fire Drake
@@ -11802,14 +15679,28 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:FIRE:4d14
 B:BITE:FIRE:4d14
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:A mighty ancient dragon, Itangast's form scorches your flesh. Wisps of 
 D:smoke curl up from his nostrils as he regards you with disdain. 
 
@@ -11823,59 +15714,23 @@ B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:EXP_80:5d5
-F:FORCE_SLEEP | NEVER_MOVE | CAN_SWIM |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is the epitome of all that is evil, in a mold. Its lifeless form draws 
 D:power from sucking the souls of those that approach it; a nimbus of pure 
 D:evil surrounds it. Luckily for you, it can't move... 
 
-N:712:Fafner the Dragon
-G:D:G
-I:120:25d110:30:130:80
-W:48:2:170000:25000
-E:0:1:0:6:1:0
-O:50:50:0:0
-B:CLAW:HURT:4d12
-B:CLAW:HURT:4d12
-B:BITE:FIRE:5d14
-B:BITE:POISON:5d14
-F:UNIQUE | MALE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | INVISIBLE | 
-F:EVIL | DRAGON | IM_FIRE | IM_POIS | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_3 | 
-S:CONF | CAUSE_3 | 
-S:BR_FIRE | BR_POIS | SCARE | CAUSE_3 | CONF
-D:The mighty dragon of myth, Fafner was a giant who slew his 
-D:brother to win a treasure hoard, and then transformed himself 
-D:into a dragon, greedily watching over his gold. 
-
-N:713:Charon, Boatman of the Styx
-G:W:B
-I:120:28d100:30:100:10
-W:47:3:0:25000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:WAIL:LOSE_ALL
-B:TOUCH:UN_POWER
-B:HIT:EXP_80:8d12
-B:HIT:EAT_GOLD:8d12
-F:UNIQUE | MALE | SMART | CAN_SWIM | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 |
-F:COLD_BLOOD | PASS_WALL | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_STUN | NO_CONF | NO_SLEEP | RES_TELE | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS |
-S:BO_ICEE | BO_NETH | BA_COLD | BA_NETH | BA_WATE |
-S:S_UNDEAD
-D:The ferryman across the river Styx to the land of the dead. 
-D:He wishes to receive payment for your entry. 
-
 N:714:Quickbeam, the Ent
 G:#:G
 I:120:40d100:30:120:15
@@ -11886,10 +15741,22 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | SUSCEP_FIRE | 
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:Unusually hasty, for an ent.  Quickbeam hates evil creatures, and orcs in 
 D:particular, since the destruction of his beloved rowan-trees to feed the 
 D:fires of Orthanc. 
@@ -11904,15 +15771,37 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:FIRE:8d14
 B:BITE:POISON:8d14
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_RANDART
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_POIS | IM_FIRE | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | BR_POIS | BR_SOUN | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:BR_POIS
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_HI_DRAGON
 D:Glaurung is the father of all dragons, and was for a long time the most 
 D:powerful.  Though this is no longer so, he still has full command over 
 D:his brood and can command them to appear whenever he so wishes.  He is 
@@ -11928,36 +15817,24 @@ B:BITE:FIRE:5d8
 B:BITE:FIRE:5d8
 B:CRUSH:HURT:3d15
 B:CRUSH:HURT:3d15
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | ANIMAL | AQUATIC | 
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 S:1_IN_9
 S:BR_FIRE
 D:A great water-beast, with an almost impenetrable skin. 
 
-N:717:Garm, Guardian of Hel
-G:C:b
-I:120:30d100:20:120:70
-W:49:2:0:25000
-E:0:1:0:2:1:0
-O:50:50:0:0
-B:CLAW:HURT:7d13
-B:CLAW:HURT:7d13
-B:BITE:HURT:8d13
-B:BITE:HURT:8d13
-F:UNIQUE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | RES_NETH |
-F:ANIMAL | EVIL | IM_FIRE | NO_SLEEP | ZANGBAND
-S:1_IN_3 | 
-S:BR_NETH | BR_COLD | BR_DARK | 
-S:S_HOUND | S_UNDEAD
-D:Garm is a gigantic hound, whose job is to guard that none escapes 
-D:the tortures of Hel, the place of punishment for the wicked 
-D:and cowardly dead. 
-
 N:718:Greater wall monster
 G:#:W
 I:120:15d40:20:80:20
@@ -11967,11 +15844,25 @@ O:0:0:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | CAN_FLY | BASEANGBAND
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:MULTIPLY | 
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+S:MULTIPLY
 D:A sentient, moving section of wall. 
 
 N:719:Nycadaemon
@@ -11984,13 +15875,32 @@ B:TOUCH:TERRIFY
 B:CLAW:HURT:6d6
 B:CLAW:HURT:6d6
 B:CLAW:HURT:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | NONLIVING | 
-F:REGENERATE | IM_ACID | IM_COLD | IM_FIRE | CAN_FLY |
-F:NO_SLEEP | NO_STUN | NO_CONF | EVIL | DEMON |
-F:INVISIBLE | KILL_WALL |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | BASEANGBAND
-S:1_IN_4 | 
-S:HOLD | BLINK | CONF | S_DEMON | BRAIN_SMASH | BR_NETH
+F:AURA_FIRE
+F:CAN_FLY
+F:DEMON
+F:DROP_1D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:INVISIBLE
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REGENERATE
+S:1_IN_4
+S:BLINK
+S:BRAIN_SMASH
+S:BR_NETH
+S:CONF
+S:HOLD
+S:S_DEMON
 D:A loathsome, sturdy, winged, horned demon, with talons that could tear 
 D:a stone wall down. 
 
@@ -12004,37 +15914,27 @@ B:HIT:HURT:4d10
 B:HIT:HURT:4d10
 B:HIT:LOSE_CON:10d2
 B:STING:POISON:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:ONLY_ITEM | DROP_1D2 | NONLIVING | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_7 | 
-S:SCARE | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_7
+S:SCARE
+S:S_DEMON
 D:A foul, humanoid creature with a long tail, clawed hands and feet, 
 D:and a disgusting, wiry, snaky beard.  They are the elite shock troops 
 D:of the hells, capable of a terrifying berserk fury. 
 
-N:721:Goat of Mendes
-G:q:D
-I:120:18d111:30:66:40
-W:50:3:0:6666
-E:0:1:0:2:1:0
-O:0:0:100:0
-B:GAZE:TERRIFY
-B:BUTT:HURT:6d6
-B:BITE:EXP_40
-B:BITE:LOSE_CON
-F:EVIL | DEMON | FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | NONLIVING |
-F:NO_CONF | NO_SLEEP | HURT_LITE | IM_FIRE | IM_COLD | ZANGBAND
-S:1_IN_4 | 
-S:BLIND | CONF | BRAIN_SMASH | SCARE | ANIM_DEAD
-S:BA_NETH | FORGET | S_UNDEAD | DRAIN_MANA |
-S:S_DEMON | CAUSE_4 | BA_COLD
-D:It is a demonic creature from the lowest hell, vaguely resembling a 
-D:large black he-goat. 
-
 N:722:Nightwing
 G:W:D
 I:120:60d60:20:120:10
@@ -12045,14 +15945,34 @@ B:TOUCH:POISON:6d5
 B:TOUCH:POISON:6d5
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:S_UNDEAD
 D:Everywhere colours seem paler and the air chiller. At the centre of the 
 D:cold stands a mighty figure. Its wings envelop you in the chill of death 
 D:as the nightwing reaches out to draw you into oblivion. Your muscles sag 
@@ -12069,12 +15989,21 @@ B:HIT:SHATTER:8d8
 B:HIT:SHATTER:8d8
 B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
-F:ONLY_ITEM | DROP_60 | DROP_GOOD | RES_TELE |
-F:BASH_DOOR | STUPID | DROP_CORPSE | 
-F:EVIL | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 |
-S:BO_PLAS | BA_FIRE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+F:STUPID
+S:1_IN_5
+S:BA_FIRE
+S:BO_PLAS
 D:It is a belligerent minotaur with a destructive magical arsenal, armed 
 D:with a hammer. 
 
@@ -12088,12 +16017,19 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | RES_NETH | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_NETH
+S:1_IN_5
 S:BR_NETH
 D:You feel a soul-tearing chill upon viewing this beast, a ghostly form of 
 D:darkness in the shape of a large dog. 
@@ -12108,12 +16044,17 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_5
 S:BR_TIME
 D:You get a terrible sense of deja vu, or is it a premonition?  All at once 
 D:you see a little puppy and a toothless old dog. Perhaps you should give 
@@ -12129,12 +16070,22 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:FRIENDS | RES_PLAS |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_5
 S:BR_PLAS
 D:The very air warps as pure elemental energy stalks towards you in the 
 D:shape of a giant hound. Your hair stands on end and your palms itch as 
@@ -12146,12 +16097,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DEMON
+S:TPORT
 D:A pile of pulsing flesh that glows with an inner hellish fire. The world 
 D:itself seems to cry out against it. 
 
@@ -12165,14 +16124,31 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ELEC:6d14
 B:BITE:ELEC:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A vast dragon of power. Storms and lightning crash around its titanic 
 D:form. Deep blue scales reflect the flashes and highlight the creature's 
 D:great muscles. It regards you with contempt. 
@@ -12186,13 +16162,30 @@ O:0:100:0:0
 B:HIT:SHATTER:20d12
 B:HIT:SHATTER:20d12
 B:BITE:POISON:6d14
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:DROP_90 | REGENERATE | KILL_WALL | RES_TELE | KILL_BODY | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS |
-F:IM_ELEC | IM_COLD | IM_FIRE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPECIAL_GENE
+F:TROLL
+F:UNIQUE
 D:Ulik is the strongest troll who has ever lived. He could challenge 
 D:the immortals and pound them to dust with his great strength. 
 
@@ -12206,15 +16199,28 @@ B:BUTT:HURT:12d13
 B:BUTT:HURT:12d13
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | IM_FIRE | IM_POIS |
-F:MORTAL | BASEANGBAND
-S:1_IN_6 | 
-S:SLOW | ARROW_4 | BO_MANA | BO_PLAS | BA_ELEC | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:UNIQUE
+S:1_IN_6
+S:ARROW_4
+S:BA_ELEC
+S:BO_MANA
+S:BO_PLAS
 S:BR_WALL
+S:SLOW
 D:A fearsome bull-headed monster, Baphomet swings a mighty axe as he curses 
 D:all that defy him. 
 
@@ -12228,14 +16234,34 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:EXP_80:10d5
 B:HIT:EXP_80:10d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BA_NETH | BA_FIRE | BO_PLAS
-S:S_MONSTERS | S_DEMON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+S:1_IN_5
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:CAUSE_3
+S:SCARE
+S:S_DEMON
+S:S_MONSTERS
 D:It is a humanoid form dressed in armour of ancient style. From beneath 
 D:its helmet, eyes glow with hellfire. 
 
@@ -12249,14 +16275,28 @@ B:CHARGE:EAT_GOLD:5d5
 B:CHARGE:EAT_ITEM:5d5
 B:SPIT:BLIND:10d5
 B:DROOL:DISEASE:8d5
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | EVIL | RES_TELE
-F:MORTAL | JOKEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:TRAPS | S_BUG
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:S_BUG
 D:He may not code worth a dime, but he certainly knows how to make money. 
 
 N:733:Santa Claus
@@ -12269,113 +16309,47 @@ B:HIT:LOSE_CHR:5d5
 B:TOUCH:LOSE_ALL:10d1
 B:TOUCH:LOSE_ALL:10d1
 B:CHARGE:EAT_GOLD
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:NO_STUN | NO_SLEEP |
-F:IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-F:COLD_BLOOD | RES_TELE | JOKEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:CAUSE_4 | HOLD | DRAIN_MANA | SCARE | BLIND | 
-S:S_UNDEAD | S_HI_UNDEAD | S_HI_DRAGON | S_UNIQUE | 
-S:BA_NETH | FORGET | TRAPS | BRAIN_SMASH | TELE_AWAY 
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
+S:SCARE
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_UNDEAD
+S:S_UNIQUE
+S:TELE_AWAY
 D:Why would anybody want to kill Santa Claus? To get all the presents, 
 D:of course! 
 
-N:734:Eihort, the Thing in the Labyrinth
-G:j:R
-I:120:33d100:50:90:10
-W:53:3:0:45000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:BITE:PARALYZE:8d1
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-F:UNIQUE | CAN_SPEAK | ESCORT | REGENERATE |
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_SLEEP | RES_TELE | CTHANGBAND | NO_CUT
-S:1_IN_4 | 
-S:S_UNDEAD | S_DEMON | S_MONSTER | BLINK | BA_ACID | FORGET
-D:"Then came pale movement in the well, and something clambered 
-D:up from the dark, a bloated blanched oval supported on myriad 
-D:fleshless legs. Eyes formed in the gelatinous oval and stared 
-D:at him." 
-
-N:735:The King in Yellow
-G:L:y
-I:120:32d100:90:100:10
-W:53:3:0:50000
-E:0:0:0:0:0:0
-O:50:0:40:10
-B:CRUSH:HURT:12d12
-B:CRUSH:HURT:12d12
-B:GAZE:LOSE_WIS:5d10
-B:GAZE:TERRIFY:5d10
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | CTHANGBAND | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | NO_CUT
-S:1_IN_2 | 
-S:S_DEMON | S_UNDEAD | S_KIN | SCARE | CAUSE_3 | CAUSE_4 | ANIM_DEAD 
-S:TELE_AWAY | TPORT | BRAIN_SMASH | CONF
-D:The King in Yellow is an Avatar of Hastur: "He has no 
-D:face, and is twice as tall as a man. He wears pointed shoes under 
-D:his tattered, fantastically colored robes, and a streamer of silk 
-D:appears to fall from the pointed tip of his hood. At times he appears 
-D:to be winged; at others, haloed." 
-
-N:736:Great unclean one
-G:U:g
-I:120:80d80:30:150:20
-W:53:3:0:17500
-E:0:0:0:0:0:0
-O:50:0:50:0
-B:BITE:DISEASE:10d10
-B:BITE:ACID:10d10
-B:BITE:POISON:10d10
-B:BITE:CONFUSE:10d10
-F:DEMON | EVIL | NONLIVING | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | DROP_GOOD | KILL_BODY |
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-F:KILL_ITEM | ZANGBAND
-S:1_IN_3
-S:BR_ACID | BR_POIS | BR_NUKE | SCARE | ANIM_DEAD 
-S:CAUSE_3 | CAUSE_4 | S_DEMON | S_UNDEAD 
-D:This disgusting demon resembles a shambling pile of rotting 
-D:green flesh, with dozens of mouths drooling and leaving a 
-D:trail of foul-smelling goo behind. Nurgle must be 
-D:proud of himself to have created this atrocity! 
-
-N:737:Lord of Chaos
-G:p:v
-I:130:45d55:30:80:5
-W:60:3:0:17500
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:KICK:HURT:20d2
-B:KICK:HURT:10d2
-B:HIT:POISON:20d1
-B:HIT:LOSE_ALL:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON |
-F:ONLY_ITEM | DROP_4D2 | ATTR_MULTI | EVIL | SHAPECHANGER | ATTR_ANY |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | EVIL |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | MIND_BLAST | BA_CHAO |
-S:S_SPIDER | S_HOUND | S_DEMON 
-D:He is one of the few true masters of the art, being extremely skillful in 
-D:all forms of unarmed combat and controlling the Chaos 
-D:with disdainful ease. 
-
 N:738:Old Sorcerer
 G:p:R
 I:130:52d25:20:60:10
@@ -12385,15 +16359,33 @@ O:0:0:100:0
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
-F:MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM |
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | CAUSE_4 | TRAPS |
-S:BO_ACID | BA_FIRE | BA_COLD | BA_POIS |
-S:S_MONSTER | S_DEMON | S_HI_DRAGON | S_UNDEAD
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A human figure in robes, he moves with magically improved speed, and his 
 D:hands are ablur with spell casting. You stagger at the mighty sound of his 
 D:spells as they echo hollowly through the dungeon. 
@@ -12408,11 +16400,15 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:FORCE_SLEEP | FRIENDS | 
-F:INVISIBLE | PASS_WALL | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:FORCE_SLEEP
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+S:1_IN_5
 S:BR_NETH
 D:A pale green hound. Pulsing red lines and strange fluorescent light 
 D:hint at internal organs best left to the imagination. 
@@ -12427,13 +16423,36 @@ B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 |
-S:BA_WATE | DARKNESS | BR_DARK | TELE_TO 
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_4
+S:BA_WATE
+S:BLIND
+S:BR_DARK
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -12447,14 +16466,32 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:COLD:6d14
 B:BITE:COLD:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_FIRE |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+S:1_IN_4
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:An immense dragon capable of awesome destruction. You have never felt 
 D:such extreme cold, or witnessed such an icy stare. Begone quickly or feel 
 D:its wrath! 
@@ -12469,15 +16506,42 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:4d12
 B:TOUCH:LOSE_DEX:4d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 |  DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | S_UNDEAD | FORGET | S_DEMON | 
-S:TPORT | HEAL | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who is partially immaterial, on its way to a new, ethereal form. 
 
 N:743:The Phoenix
@@ -12490,15 +16554,35 @@ B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
-F:UNIQUE | CAN_SPEAK | RES_PLAS | AURA_FIRE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-F:BASEANGBAND | HAS_LITE | REGENERATE
-S:1_IN_3 | 
-S:BO_FIRE | BO_PLAS | BA_FIRE | 
-S:BR_FIRE | BR_LITE | BR_PLAS
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_PLAS
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:BR_LITE
+S:BR_PLAS
 D:A massive glowing eagle bathed in flames. The searing heat chars your 
 D:skin and melts your armour. 
 
@@ -12512,98 +16596,76 @@ B:STING:LOSE_CON:8d8
 B:STING:LOSE_CON:8d8
 B:BITE:ACID:10d10
 B:BITE:ACID:10d10
-F:FORCE_SLEEP | SMART | KILL_WALL | CAN_SWIM | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | RES_TELE | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | BR_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:BR_NETH
+S:SCARE
+S:S_UNDEAD
 D:This intensely evil creature bears the form of a gargantuan black worm. 
 D:Its gaping maw is a void of blackness, and acid drips from its steely hide. 
 D:It is like nothing you have ever seen before, and a terrible chill runs 
 D:down your spine as you face it. 
 
-N:745:Lord of Change
-G:U:v
-I:130:50d70:30:150:20
-W:54:3:0:17000
-E:0:1:1:0:1:0
-O:0:0:100:0
-B:CLAW:CONFUSE:10d10
-B:CLAW:CONFUSE:10d10
-B:BITE:BLIND:12d12
-F:DEMON | EVIL | ATTR_MULTI | DROP_GOOD | MOVE_BODY | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND
-S:1_IN_3
-S:MIND_BLAST | BA_CHAO | SCARE | BRAIN_SMASH | DRAIN_MANA |
-S:S_HOUND | S_DEMON | S_DRAGON | TPORT | HASTE | CONF | SCARE |
-S:TELE_AWAY | FORGET 
-D:The most powerful of Tzeentch's servitors. This demon looks like 
-D:a huge bird-creature, with the head of a predatory bird and 
-D:fantastically multi-coloured wings. 
-
-N:746:Keeper of Secrets
-G:H:G
-I:130:60d70:30:150:20
-W:54:3:0:17000
-E:2:0:2:2:1:1
-O:0:0:100:0
-B:HIT:CONFUSE:10d10
-B:HIT:TERRIFY:10d10
-B:HIT:BLIND:10d10
-B:HIT:TERRIFY:10d10
-F:DEMON | EVIL | DROP_GOOD | NONLIVING | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_3
-S:SCARE | BRAIN_SMASH | DRAIN_MANA | 
-S:BR_CONF | S_DEMON | S_UNDEAD | TPORT | HEAL |
-S:TELE_AWAY
-D:This demonic keeper of forbidden secrets looks like a hairless 
-D:minotaur with extra arms, decorated with tattoos and nose rings. 
-D:It is the embodiment of Slaanesh's perverted magic. 
-
-N:747:Shudde M'ell
-G:w:s
-I:125:100d40:20:90:20
-W:59:2:0:23000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:SHATTER:55d2
-B:CRUSH:SHATTER:55d2
-B:TOUCH:LOSE_CON:1d2
-B:TOUCH:LOSE_CON:1d2
-F:IM_FIRE | RES_PLAS | IM_COLD | IM_POIS | ELDRITCH_HORROR | RES_TELE | 
-F:KILL_WALL | ONLY_GOLD | DROP_4D2 | DROP_2D2 | CAN_SWIM |
-F:EVIL | FORCE_MAXHP | SMART | UNIQUE | CTHANGBAND | NO_STUN
-S:1_IN_5 | 
-S:SCARE | CONF | HOLD | S_DEMON | S_KIN |
-S:HEAL | HASTE | FORGET | BRAIN_SMASH | 
-S:BR_DARK | BR_ACID | BR_DISE
-D:The most powerful and most evil of all Chthonians. 
-D:"A great gray thing a mile long chanting and exuding strange acids... 
-D:charging through the depths of the earth at a fantastic speed, in a 
-D:dreadful fury... melting basaltic rocks like butter under a blowtorch." 
-
 N:748:Hand druj
 G:s:y
 I:130:60d10:20:110:10
 W:57:2:10:18000
 E:0:0:0:1:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD | CAN_SWIM |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:TELE_AWAY | BLIND | CONF | SCARE | CAUSE_3 | FORGET | DARKNESS | 
-S:BO_FIRE | BO_ACID | BO_COLD | BO_ELEC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:SCARE
+S:TELE_AWAY
 D:A skeletal hand floating in the air, motionless except for its flexing 
 D:fingers.
 
@@ -12613,13 +16675,29 @@ I:130:10d100:20:90:10
 W:58:2:2:21000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD |
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BO_MANA | BO_NETH | BA_NETH | BRAIN_SMASH | S_UNDEAD 
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_NETH
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:S_UNDEAD
 D:A bloodshot eyeball floating in the air, you'd be forgiven for assuming it 
 D:harmless. 
 
@@ -12629,14 +16707,31 @@ I:130:14d100:20:120:10
 W:59:2:1000:24000
 E:0:0:0:0:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | RES_TELE | 
-F:SMART | COLD_BLOOD | 
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:SLOW | CAUSE_4 | MIND_BLAST | BRAIN_SMASH | TRAPS | BO_PLAS | 
-S:BO_NETH | BA_WATE | S_UNDEAD
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_WATE
+S:BO_NETH
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A glowing skull possessed by sorcerous power. It need not move, but 
 D:merely blast you with mighty magic. 
 
@@ -12650,11 +16745,21 @@ B:ENGULF:CONFUSE:5d5
 B:ENGULF:CONFUSE:5d5
 B:ENGULF:HURT:5d5
 B:ENGULF:HURT:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_CHAO
 D:Void, nothingness, spinning destructively. 
 
@@ -12668,40 +16773,54 @@ B:ENGULF:ELEC:5d5
 B:ENGULF:FIRE:5d5
 B:ENGULF:ACID:5d5
 B:ENGULF:COLD:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | CAN_FLY |
-F:RAND_50 | RAND_25 | AURA_COLD | RES_WATE | RES_DISE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_NETH | RES_NEXU |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | AURA_FIRE | AURA_ELEC |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | RES_PLAS | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | BR_LITE | 
-S:BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | BR_NETH | 
-S:BR_WALL | BR_INER | BR_TIME | BR_GRAV | BR_PLAS | BR_NEXU
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+S:1_IN_6
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:An awesome vortex of pure magic, power radiates from its frame. 
 
-N:753:Nidhogg, the Hel-Drake
-G:D:D
-I:120:39d111:20:133:70
-W:55:2:260000:25000
-E:0:1:0:6:1:0
-O:50:50:0:0
-B:CLAW:LOSE_CON:8d12
-B:CLAW:LOSE_CON:8d12
-B:BITE:EXP_80:8d15
-B:BITE:EXP_80:8d15
-F:UNIQUE | CAN_FLY | RES_NETH |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | IM_POIS |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_SPEAK | IM_ACID |
-F:EVIL | DRAGON | IM_FIRE | NO_SLEEP | IM_COLD | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_5 | 
-S:CAUSE_3 | BR_NETH | BR_COLD |
-S:BR_ACID | BR_POIS |
-S:S_DRAGON | S_UNDEAD
-D:In the bowels of Hel, the dread Nidhogg, a dragon blacker than the 
-D:night, feasts on the essences of the dead. 
-
 N:754:The Lernaean Hydra
 G:M:v
 I:120:45d100:20:140:20
@@ -12712,17 +16831,39 @@ B:BITE:POISON:8d6
 B:BITE:POISON:8d6
 B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | REGENERATE | 
-F:ANIMAL | IM_FIRE | IM_POIS | 
-F:NO_CONF | NO_STUN | CAN_SWIM |
-F:MORTAL | BASEANGBAND
-S:1_IN_3 | 
-S:SCARE | 
-S:BO_FIRE | BO_PLAS | BA_FIRE | BA_POIS | 
-S:BR_FIRE | BR_POIS | S_HYDRA | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:NO_CONF
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:SMART
+F:SUSCEP_COLD
+F:UNIQUE
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_3
+S:BA_FIRE
+S:BA_POIS
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:BR_POIS
+S:SCARE
+S:S_HYDRA
+S:S_KIN
 D:A massive legendary hydra. It has twelve powerful heads. Its many eyes 
 D:stare at you as clouds of smoke and poisonous vapour rise from its 
 D:seething form.  It grows new heads as fast as you chop them off. 
@@ -12737,15 +16878,44 @@ B:BITE:EXP_80:6d6
 B:BITE:EXP_80:6d6
 B:HIT:CONFUSE:6d6
 B:HIT:CONFUSE:6d6
-F:UNIQUE | FEMALE | SPECIAL_GENE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | NO_STUN
-F:RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_KIN | S_HI_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
 D:Chief messenger between Sauron and Morgoth, she is the most deadly of her 
 D:vampire race on Middle-earth.  At first she is charming to meet, but her 
 D:wings and eyes give away her true form. 
@@ -12760,122 +16930,59 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:6d14
 B:BITE:FIRE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | AURA_FIRE |
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+S:1_IN_4
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A vast dragon of immense power. Fire leaps continuously from its huge 
 D:form. The air around it scalds you. Its slightest glance burns you, and 
 D:you realise how truly insignificant you are. 
 
-N:757:Hastur the Unspeakable
-G:H:b
-I:120:55d95:20:150:10
-W:55:4:0:23000
-E:2:0:2:4:1:0
-O:25:25:25:10
-B:CRUSH:HURT:14d8
-B:CRUSH:HURT:14d8
-B:BITE:EXP_80:6d6
-B:BITE:EXP_80:6d6
-F:UNIQUE | ELDRITCH_HORROR | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | POWERFUL | SMART | NONLIVING |
-F:EVIL | DEMON | IM_COLD | IM_POIS | HURT_LITE | NO_SLEEP | 
-F:RES_TELE | CTHANGBAND
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_WATE | S_DEMON | HASTE |
-S:TPORT | TELE_AWAY | TELE_TO | HEAL | BR_DARK | BR_NETH
-D:His form is partially that of a reptile, partially that of a gigantic 
-D:octopus. He will destroy you. 
-
-N:758:Bloodthirster
-G:U:r
-I:130:60d70:30:180:20
-W:55:3:0:18500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:50d1
-B:HIT:HURT:50d1
-B:HIT:HURT:50d1
-F:DEMON | EVIL | DROP_GOOD | REGENERATE | CAN_FLY | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_4D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | RES_NETH | RES_NEXU | RES_TELE | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR
-F:CAN_FLY | ZANGBAND | HAS_LITE
-D:Khorne's mightiest servant, a winged hound-demon walking on 
-D:two paws and wielding a mighty axe and a whip in the other 
-D:two. Intelligent, bloodthirsty eyes leer at you from inside 
-D:the blood-soaked demon armour. 
-
 N:759:Draconic quylthulg
 G:Q:g
 I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW |
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DRAGON
+S:TPORT
 D:It looks like it was once a dragon corpse, now deeply infected with 
 D:magical bacteria that make it pulse in a foul and degrading way. 
 
-N:760:Nyogtha, the Thing that Should not Be
-G:j:D
-I:130:55d99:20:120:20
-W:56:2:0:20000
-E:0:0:0:0:0:0
-O:50:0:40:10
-B:CRUSH:ACID:10d6
-B:CRUSH:ACID:10d6
-B:CRUSH:ACID:10d6
-B:CRUSH:HURT:16d16
-F:UNIQUE | ELDRITCH_HORROR |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | SMART | CAN_SWIM |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
-F:REGENERATE | ONLY_ITEM | KILL_ITEM | DROP_2D2 | DROP_90 | DROP_60 |
-F:BASH_DOOR | EVIL | NO_CONF | NO_SLEEP | KILL_BODY |
-F:FORCE_MAXHP | FORCE_SLEEP | HURT_LITE | POWERFUL | RES_NETH | NONLIVING |
-F:IM_ACID | IM_FIRE | RES_PLAS | IM_POIS | IM_COLD | IM_ELEC | RES_TELE
-F:CTHANGBAND | NO_CUT
-S:1_IN_5 |
-S:BRAIN_SMASH | MIND_BLAST | HASTE | TPORT |
-S:S_DEMON | S_UNDEAD | S_HI_UNDEAD | S_KIN |
-S:BR_DARK | BR_NUKE | BR_ACID | BR_POIS
-D:"...a little finger of blackness crept out from beneath its edge 
-D:a great wave of iridescent blackness, neither liquid nor solid, 
-D:a frightful gelatinous mass." 
-
-N:761:Ahtu, Avatar of Nyarlathotep
-G:#:D
-I:130:50d110:30:120:15
-W:56:3:0:22500
-E:1:1:1:2:1:1
-O:0:30:60:10
-B:CRUSH:HURT:13d13
-B:CRUSH:FIRE:10d10
-B:CRUSH:HURT:13d13
-B:CRUSH:FIRE:10d10
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | DEMON | NONLIVING | ELDRITCH_HORROR | CTHANGBAND | NO_CUT | NO_SLEEP | NO_CONF | NO_STUN
-S:1_IN_6
-S:BR_FIRE | S_DEMON | CAUSE_4 | BR_PLAS | BR_NETH | BRAIN_SMASH |
-S:S_UNDEAD | BA_DARK 
-D:"Higher already than the giants of the forest ringing it, the 
-D:fifty-foot-thick column... sprouted a ring of tendrils, ruddy and 
-D:golden and glittering overall with inclusions of quartz." 
-
 N:762:Fundin Bluecloak
 G:h:B
 I:130:50d100:25:195:10
@@ -12886,15 +16993,39 @@ B:HIT:HURT:10d10
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | PET |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | BLIND | CONF | SCARE | CAUSE_3 | CAUSE_4 | BRAIN_SMASH | 
-S:FORGET | S_MONSTERS | S_ANIMALS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HEAL
+S:SCARE
+S:S_ANIMALS
+S:S_MONSTERS
 D:He is one of the greatest dwarven priests to walk the earth. Fundin has 
 D:earned a high position in the church, and his skill with both weapon and 
 D:spell only justify his position further. His combination of both dwarven 
@@ -12910,12 +17041,27 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:CRUSH:ACID:9d9
 B:CRUSH:ACID:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | BASEANGBAND | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | NONLIVING | 
-F:EVIL | DEMON | IM_POIS | IM_ACID | NO_CONF | NO_SLEEP
-S:1_IN_6 | 
-S:BR_POIS | BR_ACID | S_DEMON | BLIND | CONF | ARROW_4
+F:BASH_DOOR
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_6
+S:ARROW_4
+S:BLIND
+S:BR_ACID
+S:BR_POIS
+S:CONF
+S:S_DEMON
 D:It's big.  It's fat.  It's red.  It's ugly.  It's got a severe attack of 
 D:highly poisonous flatulence.  And its insides are corrosive.  All of which 
 D:go together to make the single most repulsive sight - and smell - you have 
@@ -12931,16 +17077,43 @@ B:HIT:FIRE:4d12
 B:HIT:FIRE:4d12
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | NO_FEAR | GOOD | AURA_FIRE | REFLECTING |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_SLEEP
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | 
-S:BO_FIRE | BO_MANA | BA_FIRE | 
-S:BR_FIRE | BR_PLAS | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SUSCEP_COLD
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BR_FIRE
+S:BR_PLAS
 S:S_ANGEL
+S:TELE_TO
 D:A creature of godly appearance. You dare not challenge Uriel's supremacy. 
 D:Those who stood against him before are but a memory, cremated by his 
 D:mastery of elemental fire.
@@ -12955,17 +17128,44 @@ B:HIT:EXP_80:10d5
 B:HIT:EXP_80:10d5
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | RES_NETH | NO_FEAR | GOOD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | REFLECTING | AURA_COLD |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | CAN_FLY | NO_SLEEP
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | 
-S:BO_MANA | BO_NETH | BA_NETH | 
-S:BR_NETH | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BR_NETH
 S:S_ANGEL
+S:TELE_TO
 D:Azriel commands awesome power, his visage holy enough to shrivel your 
 D:soul. You shriek with disbelief as his mastery of death draws you to your 
 D:grave. It is truly beyond all but the mightiest of warriors to stand 
@@ -12981,47 +17181,43 @@ B:CLAW:HURT:10d12
 B:CLAW:HURT:10d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:UNIQUE | MALE | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF |
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BR_ACID | BR_FIRE | BR_DISI | BR_WALL | BR_TIME | 
-S:S_HI_DRAGON | S_KIN
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BR_ACID
+S:BR_DISI
+S:BR_FIRE
+S:BR_TIME
+S:BR_WALL
+S:S_HI_DRAGON
+S:S_KIN
 D:"Rushing Jaws" is his name, and death is his game; the greatest and most 
 D:terrible of all dragonkind, his power dismayed even the Valar for a time. 
 
-N:767:Daoloth, the Render of the Veils
-G:U:s
-I:120:72d100:20:125:70
-W:58:3:0:27500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-F:UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:IM_ACID | IM_FIRE | IM_POIS | IM_COLD |  ELDRITCH_HORROR |
-F:NEVER_MOVE | RES_NEXU | REFLECTING | PASS_WALL
-F:NO_CONF | NO_SLEEP | NO_CUT | NO_STUN | NO_FEAR | CTHANGBAND
-S:1_IN_3 | 
-S:TELE_AWAY | S_MONSTERS | TELE_LEVEL | BR_NEXU | TPORT | BLINK
-D:"Not shapeless, but so complex that the eye could recognise no 
-D:describable shape. There were hemispheres and shining metal, 
-D:coupled by long plastic rods. The rods were of a flat gray color, 
-D:so that he could not make out which were nearer; they merged into 
-D:a flat mass from which protruded individual cylinders. As he looked 
-D:at it, he had a curious feeling that eyes gleamed from between 
-D:these rods; but wherever he glanced at the construction, he saw 
-D:only the spaces between them." 
-
 N:768:Nightwalker
 G:W:D
 I:130:80d70:20:175:10
@@ -13032,14 +17228,35 @@ B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:7d7
 B:HIT:UN_BONUS:7d7
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | CAN_SWIM |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:SCARE
+S:S_UNDEAD
 D:A huge giant garbed in black, more massive than a titan and stronger than 
 D:a dragon. With terrible blows, it breaks your armour from your back, 
 D:leaving you defenceless against its evil wrath. It can smell your fear, 
@@ -13056,63 +17273,104 @@ B:HIT:UN_BONUS:6d8
 B:HIT:FIRE:6d8
 B:HIT:BLIND:10d10
 B:HIT:BLIND:10d10
-F:UNIQUE | MALE | FORCE_MAXHP | CAN_SPEAK | NO_SLEEP | GOOD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | AURA_ELEC | REFLECTING | RES_TELE
-F:ESCORT | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | BO_MANA | 
-S:S_ANGEL | S_KIN
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:FORCE_MAXHP
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BLIND
+S:BO_MANA
+S:S_ANGEL
+S:S_KIN
+S:TELE_TO
 D:Commanding a legion of angels, Gabriel will destroy you for your sins. He 
 D:will crush you like the pitiful insignificant being he sees you to be. 
 D:Your very soul will be taken into judgement by his supreme authority as he 
 D:cleanses the world of evil. 
 
-N:770:Artsi, the Champion of Chaos
-G:h:v
-I:130:11d666:25:175:10
-W:59:2:1600:20000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_80:10d10
-B:HIT:EXP_80:10d10
-B:HIT:EXP_80:10d10
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_NETH |  
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BA_FIRE | BA_CHAO | CONF | TPORT | S_DEMON | BR_CHAO | BA_MANA
-D:He is one of the greatest warriors of chaos to walk the earth. 
-D:His bloody blade has slain thousands and tens of thousands, and still 
-D:hungers for more. 
-
 N:771:Saruman of Many Colours
 G:p:v
 I:120:70d100:100:100:0
 W:60:1:1600:35000
 E:1:1:1:2:1:1
 O:0:0:100:0
+A:202:30
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:DROP_GREAT | DROP_CHOSEN |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | MIND_BLAST | FORGET | TRAPS | ANIM_DEAD | BO_MANA | 
-S:BO_ICEE | BA_ACID | BA_FIRE | BA_COLD | BA_WATE | BA_CHAO | 
-S:S_UNDEAD | S_DEMON | S_HI_DRAGON | S_ANIMALS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BA_CHAO
+S:BA_COLD
+S:BA_FIRE
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_ANIMALS
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_UNDEAD
+S:TELE_AWAY
+S:TPORT
 D:Originally known as the White, Saruman fell prey to Sauron's wiles. He 
 D:searches forever for the One Ring, to become a mighty Sorcerer-King of the 
 D:world. 
@@ -13127,13 +17385,23 @@ B:TOUCH:EAT_GOLD:5d5
 B:TOUCH:EAT_ITEM:5d5
 B:HIT:BLIND:10d5
 B:HIT:POISON:8d5
-F:UNIQUE | MALE | CAN_SPEAK | SMART | 
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | BASEANGBAND
-S:1_IN_6 | 
-S:TELE_TO | TRAPS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:TELE_TO
 D:He is a master of disguise, an expert of stealth, a genius at traps, and 
 D:moves with blinding speed. Check your pockets! 
 
@@ -13147,13 +17415,33 @@ B:HIT:LOSE_CHR:8d8
 B:HIT:LOSE_CHR:8d8
 B:BITE:POISON:10d10
 B:STING:LOSE_STR:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | NONLIVING | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | INVISIBLE | BASEANGBAND | 
-F:IM_ACID | IM_ELEC | IM_POIS | IM_COLD | IM_FIRE | NO_CUT
-S:1_IN_6 | 
-S:BA_ELEC | BA_COLD | BO_ICEE | SCARE | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_6
+S:BA_COLD
+S:BA_ELEC
+S:BO_ICEE
+S:SCARE
+S:S_DEMON
 D:It is a demon made almost entirely out of bones.  It is humanoid, but with 
 D:a large tail similar to that of a giant scorpion, and emits a foul smell 
 D:of decay and rot.  They are despised even in the hells. 
@@ -13168,15 +17456,37 @@ B:HIT:EXP_40:6d6
 B:HIT:EXP_40:6d6
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:HOLD | DRAIN_MANA | BLIND | S_UNDEAD | CONF |
-S:SCARE | TELE_TO | TPORT | BRAIN_SMASH | ANIM_DEAD
-S:BA_NETH | DARKNESS
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:It is a massive form of animated death, its colour deeper than black.  It 
 D:drinks in light, and space around it is twisted and torn by the weight of 
 D:its evil.  It is unlife and it knows nothing but the stealing of souls and 
@@ -13192,13 +17502,39 @@ B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | TELE_TO | TELE_AWAY |
-S:BA_WATE | DARKNESS | BR_DARK | BR_ACID | BR_POIS
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_3
+S:BA_WATE
+S:BLIND
+S:BR_ACID
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_AWAY
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -13212,15 +17548,41 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:8d12
 B:TOUCH:LOSE_DEX:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 |  DROP_2D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | SCARE | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | FORGET |
-S:TPORT | HEAL | S_DEMON | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who has reached its ultimate evolutionary stage: a completely 
 D:immaterial state. 
 
@@ -13234,14 +17596,25 @@ B:CLAW:CONFUSE:12d12
 B:CLAW:LOSE_DEX:2d12
 B:CLAW:BLIND:10d5
 B:BITE:PARALYZE:15d1
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | BASEANGBAND
-S:1_IN_3 | 
-S:TELE_TO | S_KIN
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:S_KIN
+S:TELE_TO
 D:Master of all things feline, the Cat Lord moves with catlike stealth. 
 
 N:778:Jabberwock
@@ -13254,14 +17627,21 @@ B:CLAW:HURT:10d10
 B:CLAW:HURT:10d10
 B:BITE:HURT:10d10
 B:BITE:HURT:10d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_90 | 
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND | 
-S:1_IN_5 | 
-S:CAUSE_4 | 
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+S:1_IN_5
 S:BR_CHAO
+S:CAUSE_4
 D:'Twas brillig, and the slithy toves / Did gyre and gimble in the wabe: /
 D:All mimsy were the borogoves, / And the mome raths outgrabe. /
 D:"Beware the Jabberwock, my son! / The jaws that bite, the claws that catch!" 
@@ -13276,36 +17656,22 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:ATTR_MULTI | ATTR_ANY | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FRIENDS | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_CHAO
 D:A constantly changing canine form, this hound rushes towards you as if 
 D:expecting mayhem and chaos ahead. It appears to have an almost kamikaze 
 D:relish for combat. You suspect all may not be as it seems. 
 
-N:780:Vlad Dracula, Prince of Darkness
-G:V:D
-I:130:70d100:20:166:10
-W:76:4:1800:33333
-E:1:1:1:2:1:1
-O:0:10:90:0
-B:BITE:EXP_80:8d8
-B:BITE:EXP_80:8d8
-B:HIT:CONFUSE:8d8
-B:HIT:CONFUSE:8d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:RES_TELE | ZANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | S_HI_UNDEAD | 
-S:BRAIN_SMASH | BA_NETH | S_KIN | DARKNESS | BA_DARK
-D:The most feared of all vampires, the Prince of Darkness himself. 
-
 N:781:Beholder hive-mother
 G:e:y
 I:120:40d100:30:80:10
@@ -13316,12 +17682,31 @@ B:BITE:EXP_80:6d6
 B:GAZE:PARALYZE:5d5
 B:GAZE:INSANITY:5d5
 B:GAZE:UN_POWER:5d5
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | FEMALE | SMART | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_ACID | BA_FIRE | BA_COLD | BO_NETH | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 S:S_KIN
 D:A hive mother of the race of beholders, she can summon her brood to her aid 
 D:whenever she wishes. 
@@ -13336,12 +17721,31 @@ B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:CRUSH:HURT:6d15
 B:CRUSH:HURT:6d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:ANIMAL | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_9
-S:BR_FIRE | BR_ACID | BR_DARK | BR_POIS | BA_WATE | 
-S:S_DRAGON | S_HYDRA | HEAL | CONF | DARKNESS
+S:BA_WATE
+S:BR_ACID
+S:BR_DARK
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DRAGON
+S:S_HYDRA
 D:An enormous, terrible sea-monster, the true master of the ocean.
 
 N:783:Great Wyrm of Chaos
@@ -13354,15 +17758,34 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | RES_DISE | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_CHAO | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of changing form. As you watch, it appears first fair 
 D:and then foul. Its body is twisted by chaotic forces as it strives to 
 D:stay real. Its very existence distorts the universe around it. 
@@ -13377,15 +17800,33 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | 
-S:S_DRAGON | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of powerful intellect. It seeks to dominate the universe 
 D:and despises all other life. It sees all who do not obey it as mere 
 D:insects to be crushed underfoot. 
@@ -13400,38 +17841,41 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:HURT:8d14
 B:BITE:HURT:8d14
-F:DRAGON | EVIL | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | RES_DISE |
-F:NO_STUN | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_CHAO | BR_SHAR | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon, it is thousands of 
 D:years old and seeks to maintain the Cosmic Balance. It sees you as an 
 D:upstart troublemaker without the wisdom to control your actions. 
 
-N:786:Shambler
-G:E:W
-I:130:50d100:40:150:50
-W:67:4:9000:22500
-E:0:0:0:0:0:0
-O:20:20:60:0
-B:CLAW:HURT:3d12
-B:CLAW:HURT:3d12
-B:CRUSH:HURT:8d12
-B:CRUSH:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | CAN_SWIM | DROP_CORPSE | 
-F:BASH_DOOR | OPEN_DOOR | POWERFUL | MOVE_BODY | 
-F:NO_CONF | NO_SLEEP | EVIL | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BR_ELEC
-D:This elemental creature is power incarnate; it looks like a huge polar bear 
-D:with a huge gaping maw instead of a head. 
-
 N:787:Gelugon
 G:U:w
 I:130:45d100:20:100:80
@@ -13442,45 +17886,37 @@ B:CLAW:COLD:6d10
 B:CLAW:COLD:6d10
 B:BITE:COLD:9d9
 B:HIT:PARALYZE:8d8
-F:FORCE_SLEEP | FORCE_MAXHP | BASEANGBAND | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | CAN_FLY | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | REGENERATE | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | NO_SLEEP 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
 S:1_IN_6
-S:BR_COLD | BR_SHAR | BA_COLD | BO_ICEE | S_HI_DEMON | 
-S:SLOW | SCARE | HOLD
+S:BA_COLD
+S:BO_ICEE
+S:BR_COLD
+S:BR_SHAR
+S:HOLD
+S:SCARE
+S:SLOW
+S:S_HI_DEMON
 D:This demon from the ice planes is a truly terrifying sight.  It has an 
 D:extremely large, insect-like body towering a full twelve feet tall, with 
 D:great claws on its hands and pincers on its mouth, and its head bulges 
 D:with great multi-faceted eyes.  Its tail is covered with razor-sharp 
 D:spikes. 
 
-N:788:Glaaki
-G:~:v
-I:130:52d99:20:150:10
-W:67:2:0:36000
-E:0:0:0:0:1:0
-O:0:0:100:0
-B:STING:HURT:20d1
-B:STING:DISEASE:20d1
-B:CRUSH:HURT:3d20
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ELDRITCH_HORROR |
-F:NO_STUN | RES_NEXU | RES_WATE | CAN_SWIM | REGENERATE |
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL | SMART | DEMON |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:NO_STUN | 
-F:IM_POIS | IM_COLD | IM_ACID | CTHANGBAND
-S:1_IN_5
-S:BA_WATE | S_HYDRA | S_DRAGON | S_DEMON | SCARE |
-S:BLIND | CONF | CAUSE_4 | BR_POIS
-D:"From an oval body protruded countless thin, pointed spines of 
-D:multi-colored metal; at the more rounded end of the oval a 
-D:circular, thick-lipped mouth formed the centre of a spongy 
-D:face, from which rose three yellow eyes on thin stalks. Around 
-D:the underside of the body were many white pyramids, presumably 
-D:used for locomotion. The diameter of the body must have been 
-D:at least ten feet at its least wide..." 
-
 N:789:Trone, the Rebel Thunderlord
 G:B:D
 I:130:80d100:20:120:80
@@ -13491,15 +17927,38 @@ B:HIT:HURT:12d10
 B:HIT:HURT:12d10
 B:CHARGE:HURT:10d10
 B:CHARGE:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | SPECIAL_GENE | 
-F:FORCE_MAXHP | REGENERATE | THUNDERLORD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_CHOSEN |
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SCARE | BR_TIME | BR_FIRE |
-S:BO_MANA | S_THUNDERLORD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BO_MANA
+S:BR_FIRE
+S:BR_TIME
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_TO
 D:As the Thunderlords came from afar to help the elves, Trone and his rebel 
 D:wing came to defend Morgoth! He is an evil and powerful Thunderlord. 
 
@@ -13513,15 +17972,41 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:CLAW:HURT:8d14
 B:BITE:HURT:8d14
-F:ATTR_MULTI | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | AURA_ELEC | RES_TELE | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_COLD | IM_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:BR_POIS | BR_ELEC | BR_ACID | BR_FIRE | BR_COLD |
-S:CONF | SCARE | BLIND
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge dragon whose scales shimmer in myriad hues. 
 
 N:791:Marda, rider of gold Laronth
@@ -13530,19 +18015,47 @@ I:130:100d85:100:100:50
 W:75:6:420000:35000
 E:1:1:1:2:1:1
 O:50:50:0:0
+A:26:50
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
-F:UNIQUE | FEMALE | CAN_SPEAK | THUNDERLORD | ONLY_ITEM | RES_TELE | 
-F:DROP_CHOSEN | DROP_CORPSE | DROP_SKELETON | CAN_FLY | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 |
-F:EVIL | IM_POIS | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:SCARE | BLIND | TPORT | BLINK | TELE_AWAY | TELE_TO | 
-S:BR_FIRE | BA_MANA | S_THUNDERLORD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_MANA
+S:BLIND
+S:BLINK
+S:BR_FIRE
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Former leader among the Thunderlords, she and Trone have fallen under the 
 D:control of Morgoth. Laronth, her eagle, can summon Thunderlords to her aid. 
 
@@ -13556,16 +18069,37 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | AURA_COLD |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | CONF | 
-S:BA_DARK | BA_NETH | 
-S:S_WRAITH | S_HI_UNDEAD | S_KIN
+F:AURA_COLD
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BA_NETH
+S:BLIND
+S:CONF
+S:HOLD
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_WRAITH
 D:This huge affront to existence twists and tears at the fabric of space. 
 D:Darkness itself recoils from the touch of Tselakus as he leaves a trail 
 D:of death and destruction. Mighty claws rend reality as he 
@@ -13581,40 +18115,38 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:ELEC:8d14
 B:BITE:ELEC:8d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_COLD | DROP_CORPSE | 
-F:IM_ELEC | EVIL | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 |
-S:BR_ELEC | BR_GRAV | BR_LITE |
-S:S_DRAGON | S_HI_DRAGON |
-S:SCARE | BLIND
+F:AURA_COLD
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ELEC
+S:BR_GRAV
+S:BR_LITE
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:The mightiest elemental dragon of air, it can destroy you with ease. 
 
-N:794:Eilinel the Entrapped
-G:p:D
-I:120:90d10:10:40:1
-W:42:10:0:3500
-E:1:1:1:2:1:1
-O:20:20:50:10
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-B:TOUCH:UN_POWER:3d3
-B:TOUCH:UN_BONUS:3d3
-F:UNIQUE | FEMALE |
-F:FORCE_MAXHP |
-F:DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | NO_CONF | NO_SLEEP | ZANGBAND | NO_CUT | NO_STUN
-S:1_IN_2 |
-S:BLINK | TELE_TO | HEAL | S_MONSTER | BO_ACID | BO_MANA | CAUSE_3
-D:In life, she was the wife of Gorlim. In death, her shade was 
-D:entrapped by Morgoth and used to trick her husband into betraying 
-D:Barahir. Now she is totally entrapped by Morgoth's power, and uses 
-D:her magic to do his bidding. 
-
 N:795:Horned Reaper
 G:U:B
 I:130:50d100:40:120:80
@@ -13625,68 +18157,38 @@ B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | 
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | CAN_FLY | 
-F:IM_FIRE | IM_COLD | IM_POIS | IM_ACID | IM_ELEC
-S:1_IN_5 | 
-S:HASTE | SLOW | SCARE | S_HI_DEMON 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+S:1_IN_5
+S:HASTE
+S:SCARE
+S:SLOW
+S:S_HI_DEMON
 D:A giant humanoid demon wielding a massive, heavy and sharp scythe.  Feared 
 D:by foes and friends alike when it flies into one of its berserk rages, the 
 D:Horned Reaper will cut down anything in its path between it and you - even 
 D:the minions it has just summoned. 
 
-N:796:The Norsa
-G:H:B
-I:130:100d100:20:125:70
-W:70:4:16000:47500
-E:0:1:0:2:1:0
-O:50:0:50:0
-B:CRUSH:ACID:8d12
-B:CRUSH:FIRE:8d12
-B:CRUSH:ELEC:8d12
-B:CRUSH:POISON:10d14
-F:ATTR_MULTI | ELDRITCH_HORROR | DROP_CORPSE | 
-F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | EVIL |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:ZANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | SCARE | 
-S:BR_NETH | BR_CHAO | BR_TIME | BR_GRAV | BR_DISI | 
-S:S_HI_DRAGON | S_MONSTERS
-D:An elephantine horror with five trunks, each capable of breathing 
-D:destructive blasts. It is said that it is better to face the fury 
-D:of a thousand raging lions than the Norsa! 
-
-N:797:Rhan-Tegoth
-G:S:b
-I:130:90d100:20:125:70
-W:70:4:0:42500
-E:0:1:0:2:1:0
-O:0:50:50:0
-B:CLAW:HURT:8d12
-B:CRUSH:LOSE_STR:5d12
-B:CLAW:HURT:8d12
-B:CRUSH:ACID:5d12
-F:ELDRITCH_HORROR | CAN_SWIM | EVIL |
-F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_ELEC | IM_POIS | NO_SLEEP | RES_WATE | CTHANGBAND
-S:1_IN_5 | 
-S:S_DEMON | BR_ACID | S_UNDEAD | S_KIN | CONF | SCARE |
-S:MIND_BLAST | BR_CONF 
-D:"An almost globular torso, with six long, sinuous limbs terminating 
-D:in crab-like claws. From the upper end a subsidiary globe bulged 
-D:forward bubble-like; its triangle of three staring, fishy eyes, 
-D:its foot-long and evidently flexible proboscis, and a distended 
-D:lateral system analogous to gills, suggested that it was a head." 
-
 N:798:Black reaver
 G:L:D
 I:120:50d100:20:170:50
@@ -13697,15 +18199,40 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SWIM |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_MANA | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:S_UNDEAD
+S:TELE_TO
 D:A humanoid form,  black as night, advancing steadily and unstoppably, even 
 D:the very rock of the dungeon cannot prevent it reaching you. 
 
@@ -13718,13 +18245,38 @@ O:20:40:40:0
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 |
-F:SMART | BASH_DOOR | TAKE_ITEM | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_ELEC | IM_POIS | BASEANGBAND | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CONF | SCARE | TPORT | BA_COLD | BA_FIRE | 
-S:MIND_BLAST | BRAIN_SMASH | S_MONSTERS | TELE_AWAY | BLINK | BO_NETH
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:SMART
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 D:A mindcrafter of the highest order.  Powerful and evil, and a dangerous 
 D:enemy: a master of mind over matter, of his own mind, and of the minds of 
 D:others, who slavishly follow him into battle when he calls them.
@@ -13735,12 +18287,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DEMON
+S:TELE_TO
 D:A massive pulsating mound of flesh, glowing with an inner hellish light. 
 
 N:801:Greater draconic quylthulg
@@ -13749,12 +18310,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DRAGON
+S:TELE_TO
 D:A massive mound of scaled flesh, throbbing and pulsating with multi-hued 
 D:light. 
 
@@ -13764,33 +18334,25 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND |NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_UNDEAD
+S:TELE_TO
 D:A massive pile of rotting flesh. A disgusting stench fills the air as it 
 D:throbs and writhes. 
 
-N:803:Null, the Living Void
-G:.:d
-I:110:50d100:30:100:20
-W:72:2:0:32500
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:LOSE_ALL:6d16
-B:TOUCH:EXP_80:6d16
-B:TOUCH:UN_POWER:6d16
-F:PASS_WALL | NONLIVING | IM_ACID | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | SMART | EMPTY_MIND | 
-F:ELDRITCH_HORROR | IM_COLD | RES_NETH | NO_STUN | UNIQUE | NO_SLEEP | NO_CONF | NO_FEAR |
-F:REGENERATE | ZANGBAND | NO_CUT
-S:1_IN_5
-S:BR_NETH | BRAIN_SMASH | SCARE | S_UNDEAD | S_HI_UNDEAD |
-S:DRAIN_MANA | HEAL | ANIM_DEAD
-D:A black hole in the fabric of reality. It simply is not there. 
-
 N:804:Feagwath, the Undead Sorcerer
 G:L:y
 I:130:60d100:20:85:50
@@ -13801,18 +18363,43 @@ B:TOUCH:EXP_80:6d12
 B:TOUCH:UN_POWER:6d12
 B:TOUCH:LOSE_DEX:6d12
 B:TOUCH:LOSE_DEX:6d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | HOLD | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | TRAPS | BA_MANA | 
-S:BO_MANA | BA_NETH | 
-S:S_MONSTERS | S_UNDEAD | S_KIN | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_MANA
+S:BA_NETH
+S:BLINK
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_KIN
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 D:A stench of corruption and decay surrounds this sorcerer, who has clearly 
 D:risen from the dead to continue his foul plots and schemes. 
 
@@ -13826,44 +18413,35 @@ B:GAZE:UN_BONUS:6d6
 B:GAZE:UN_POWER:6d6
 B:GAZE:INSANITY:6d6
 B:BITE:EXP_80:8d8
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:SMART | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_NETH | BA_ACID | BA_FIRE | BA_COLD | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 S:S_KIN
 D:A beholder of great size and age, floating in the air.  His gaze seems to 
 D:shred your soul and his spells crush your will.  He is ancient, his history 
 D:steeped in forgotten evils, his atrocities numerous and sickening. 
 
-N:806:Tsathoggua, the Sleeper of N'kai
-G:R:D
-I:130:66d100:30:80:100
-W:74:4:0:16500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:LOSE_ALL:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:LOSE_ALL:5d6
-B:CRUSH:ACID:5d6
-F:UNIQUE | CAN_SPEAK | RES_TELE | ELDRITCH_HORROR |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | DROP_2D2 | 
-F:ONLY_ITEM | DROP_GOOD | MOVE_BODY |
-F:SMART | BASH_DOOR | 
-F:EVIL | DEMON | IM_POIS | IM_ACID | IM_COLD |
-F:NO_CONF | NO_SLEEP | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2 | 
-S:S_DEMON | S_MONSTERS | S_UNDEAD | HOLD | SCARE | MIND_BLAST |
-S:BR_ACID | BR_NETH | CAUSE_4 
-D:"...the formless bulking of a couchant mass. And the mass stirred 
-D:a little... and put forth with infinite slothfulness a huge and 
-D:toad-shaped head. And the head opened its eyes very slowly, as if 
-D:half awakened from slumber, so that they were visible as two slits 
-D:of oozing phosphor in the black browless face." 
-
 N:807:Greater Balrog
 G:U:v
 I:130:75d100:40:140:40
@@ -13874,15 +18452,41 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:7d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | KILL_WALL |
-F:RES_NETH | RES_PLAS | REGENERATE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_FIRE | BA_NETH | BA_FIRE | BR_PLAS | BO_PLAS |
-S:S_HI_DEMON | S_UNDEAD | S_DEMON | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_PLAS
+F:SMART
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:S_DEMON
+S:S_HI_DEMON
+S:S_UNDEAD
 D:Originally of the semi-divine Maiar, this evil spirit swore allegiance 
 D:to Morgoth at the beginning of time and is now one of his most terrible 
 D:demonic servants.  With its flaming whip and sword it seeks to destroy you. 
@@ -13897,68 +18501,41 @@ B:CLAW:POISON:8d6
 B:CLAW:POISON:8d6
 B:BITE:PARALYZE:8d10
 B:STING:LOSE_STR:8d4
-F:UNIQUE | FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND
-S:1_IN_3 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | DARKNESS | BA_DARK | 
-S:BR_POIS | BR_DARK | S_SPIDER
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPIDER
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:SCARE
+S:SLOW
+S:S_SPIDER
 D:This enormous, hideous spirit of void is in the form of a spider of 
 D:immense proportions.  She is surrounded by a cloud of Unlight as she sucks 
 D:in all living light into her bloated body, and breathes out the blackest of 
 D:darkness.  She is always ravenously hungry and would even eat herself to 
 D:avoid starvation. 
 
-N:809:Atlach-Nacha, the Spider God
-G:S:D
-I:120:110d100:8:160:80
-W:73:1:2000:31000
-E:0:1:0:2:1:0
-O:60:0:40:0
-B:BITE:POISON:3d9
-B:BITE:LOSE_STR:3d9
-B:STING:POISON:2d9
-B:STING:LOSE_STR:2d9
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | MOVE_BODY | NONLIVING |
-F:ANIMAL | SPIDER | EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:CTHANGBAND
-S:1_IN_3 |
-S:SCARE | BLIND | CONF | HOLD | BR_POIS |
-S:DARKNESS | BR_DARK | S_KIN | S_HI_DEMON
-D:"...there was a kind of face on the squat ebon body, low down amid 
-D:the several-jointed legs. The face peered up with a weird expression 
-D:of doubt and inquiry..." 
-
-N:810:Y'golonac
-G:H:R
-I:120:130d99:8:160:80
-W:75:1:0:37500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:LOSE_INT:1d20
-B:BITE:HURT:40d1
-B:TOUCH:LOSE_WIS:1d20
-B:BITE:HURT:40d1
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | MOVE_BODY | NONLIVING |
-F:EVIL | IM_POIS | CTHANGBAND
-S:1_IN_3 |
-S:SCARE | BLIND | CONF | HOLD | HASTE | DRAIN_MANA | HASTE |
-S:CAUSE_3 | CAUSE_4 | DARKNESS | FORGET | S_DEMON | S_HOUND |
-S:TPORT | TELE_TO
-D:"He saw why the shadow on the frosted pane yesterday had been 
-D:headless and he screamed... but before he could scream out his 
-D:protest his breath was cut off, as the hands descended on his 
-D:face and the wet red mouths opened in their palms." 
-
 N:811:Aether hound
 G:Z:v
 I:120:60d40:30:100:0
@@ -13969,18 +18546,50 @@ B:BITE:HURT:3d12
 B:BITE:HURT:3d12
 B:CLAW:HURT:3d12
 B:CLAW:HURT:3d12
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | CAN_FLY |
-F:FRIENDS | RES_NETH | RES_PLAS | RES_NEXU | RES_DISE |
-F:BASH_DOOR | AURA_FIRE | AURA_ELEC | AURA_COLD | 
-F:DROP_CORPSE | DROP_SKELETON |
-F:ANIMAL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | 
-S:BR_LITE | BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | 
-S:BR_NETH | BR_DISE | BR_WALL | BR_INER | BR_TIME | 
-S:BR_GRAV | BR_PLAS | BR_NEXU
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+S:1_IN_5
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:A shifting, swirling form. It seems to be all colours and sizes and 
 D:shapes, though the dominant form is that of a huge dog. You feel very 
 D:uncertain all of a sudden. 
@@ -13995,130 +18604,40 @@ B:CLAW:FIRE:8d10
 B:CLAW:FIRE:8d10
 B:BITE:POISON:7d10
 B:BITE:LOSE_CON:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL | CAN_FLY | 
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_5 | 
-S:S_HI_DEMON | S_HI_DRAGON | BR_FIRE | BR_POIS | BR_CHAO | BA_CHAO | 
-S:SCARE | BA_FIRE | CAUSE_4 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+S:1_IN_5
+S:BA_CHAO
+S:BA_FIRE
+S:BR_CHAO
+S:BR_FIRE
+S:BR_POIS
+S:CAUSE_4
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
 D:Appearing as a giant, clawed and winged humanoid with a scaly red body 
 D:and massive fangs dripping a foul green liquid, the Pit Fiend is a 
 D:dreadful enemy from the lowest depths of the hells.  They are often the 
 D:commanders of vast demon armies. 
 
-N:813:The Serpent of Chaos
-G:J:v
-I:130:66d100:30:180:150
-W:75:2:0:25000
-E:0:0:0:0:1:0
-O:40:40:20:0
-B:CRUSH:POISON:15d10
-B:CRUSH:CONFUSE:15d10
-B:CRUSH:UN_BONUS:10d15
-B:CRUSH:UN_POWER:10d15
-F:UNIQUE | ATTR_MULTI | ATTR_ANY | AURA_FIRE | AURA_COLD | 
-F:FORCE_SLEEP | FORCE_MAXHP | POWERFUL | REGENERATE | 
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | ANIMAL | EVIL | CAN_FLY |
-F:KILL_ITEM | KILL_BODY |
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | ZANGBAND | 
-F:IM_COLD | IM_FIRE | IM_POIS
-S:1_IN_3 | 
-S:BR_CHAO | BR_DISI | BA_CHAO | BR_NETH | BR_MANA | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_DRAGON
-D:Writhing coil upon coil, this mighty spawn of Chaos constantly disintegrates 
-D:and reforms before your dazzled eyes. It gazes balefully upon you with its 
-D:one remaining eye, and seeks to destroy you utterly. 
-
-N:814:Yig, Father of Serpents
-G:J:b
-I:130:111d60:100:100:15
-W:76:1:2300:37500
-E:0:0:0:0:1:0
-O:80:0:20:0
-B:CLAW:POISON:8d10
-B:CLAW:POISON:8d10
-B:CRUSH:HURT:8d15
-B:BITE:HURT:100d1
-F:UNIQUE | MALE | CAN_SPEAK | SMART | RES_TELE | ANIMAL |
-F:ESCORT | ESCORTS | CAN_SWIM | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:EVIL | IM_POIS | IM_ACID | IM_ELEC | REGENERATE | ZANGBAND
-S:1_IN_4 |
-S:BR_POIS | BR_NUKE | BR_ACID | S_HYDRA | S_KIN | S_DEMON |
-D:"The half-human father of serpents... the snake-god of the central 
-D:plains tribes -- presumably the primal source of the more 
-D:southerly Quetzalcoatl or Kukulcan -- was odd, half-anthropomorphic 
-D:devil."
-
-N:815:Unmaker
-G:E:v
-I:120:6d66:60:50:60
-W:77:4:0:10000
-E:0:0:0:0:0:0
-O:20:50:20:0
-B:TOUCH:LOSE_ALL:10d10
-B:TOUCH:UN_BONUS:10d10
-B:TOUCH:UN_POWER:10d10
-F:KILL_WALL | KILL_ITEM | KILL_BODY | NO_FEAR |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ATTR_MULTI | SHAPECHANGER | ATTR_ANY |
-F:DROP_60 | DROP_GOOD | POWERFUL | AURA_ELEC | AURA_FIRE | AURA_COLD |
-F:BASH_DOOR | IM_ELEC | IM_FIRE | RES_NEXU | IM_COLD | ZANGBAND | 
-F:IM_POIS | IM_ACID | RES_PLAS | RES_DISE | COLD_BLOOD | NONLIVING | RAND_50
-F:NO_CUT
-S:MULTIPLY | 
-S:1_IN_5 |
-S:BR_CHAO
-D:Spawned from the Pits of the Abyss, it is a mass of sentient Chaos, 
-D:spreading uncontrollably and destroying everything in its path. 
-
-N:816:Cyberdemon
-G:U:u
-I:120:70d101:90:90:90
-W:77:4:15000:30000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-F:RAND_25 | EVIL | DEMON |
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | SUSCEP_ACID |
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_4 |
-S:ROCKET
-D:Reverbrant metal steps announce the arrival of this huge creature, 
-D:half demon half machine. It has an unsurpassable firepower. 
-
-N:817:Hela, Queen of the Dead
-G:p:G
-I:130:74d100:60:110:10
-W:74:3:8000:45000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:50d1
-B:TOUCH:EXP_80:50d1
-B:TOUCH:UN_BONUS:50d1
-F:UNIQUE | FEMALE | CAN_SPEAK | POWERFUL | RES_TELE |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | RES_NETH | IM_COLD | IM_POIS |
-F:IM_FIRE | NO_CONF | NO_SLEEP | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:CAUSE_3 | CAUSE_4 | HAND_DOOM | TELE_TO | HOLD |
-S:S_UNDEAD | S_HI_UNDEAD | S_HI_DRAGON | FORGET | SCARE | BLIND |
-S:BA_DARK | BA_NETH | HEAL | ANIM_DEAD
-D:The Norse ruler of Hel is a merciless queen, who ever hunts for more 
-D:souls to add to her collection of tortured spirits. She arrives in 
-D:an ominous green robe, a certain sign of impending doom, to claim 
-D:as her own those who die an ignoble death. 
-
 N:818:The Mouth of Sauron
 G:p:v
 I:130:90d100:60:100:10
@@ -14129,16 +18648,35 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | HOLD | CAUSE_3 | TRAPS | ANIM_DEAD |
-S:BO_PLAS | BA_DARK | BA_MANA | BA_FIRE | BA_WATE | BA_NETH
-S:S_HI_DEMON | S_HI_UNDEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:HOLD
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
 D:The Mouth of Sauron is a mighty spell caster. So old that even he cannot 
 D:remember his own name, his power and evil are undeniable. He believes 
 D:unshakeably that he is unbeatable and laughs as he weaves his awesome 
@@ -14154,16 +18692,42 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_POWER:6d8
 B:HIT:BLIND:6d8
 B:HIT:CONFUSE:6d8
-F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD | SPECIAL_GENE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:CAUSE_3 | TELE_TO | BA_FIRE | DRAIN_MANA | HOLD |
-S:TRAPS | BA_WATE | BO_PLAS | BA_NETH |
-S:BA_MANA | BA_DARK | S_HI_UNDEAD | BA_CHAO | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HOLD
+S:S_HI_UNDEAD
+S:TELE_TO
 D:The dark master of the terrible fortress of southern Mirkwood.  It is 
 D:rumoured that this is in fact none other than Sauron in disguise: 
 D:although if this is so, he has yet to reveal his full power - and perhaps 
@@ -14179,15 +18743,44 @@ B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
-F:UNIQUE | FEMALE | THUNDERLORD | RES_TELE | CAN_FLY | GOOD |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | PET |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:TPORT | TELE_TO | BR_FIRE | S_THUNDERLORD | 
-S:TELE_AWAY | HEAL | BA_NETH | BO_NETH | BA_FIRE | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BA_NETH
+S:BO_FIRE
+S:BO_NETH
+S:BR_FIRE
+S:HEAL
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:She came to help you. 
 
 N:821:Master quylthulg
@@ -14196,11 +18789,25 @@ I:120:30d100:20:1:0
 W:76:2:7000:15000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:S_MONSTERS | S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_ANIMALS | BLINK | TELE_TO
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:TELE_TO
 D:A giant seething mass of flesh, overwhelming you with monster after monster. 
 
 N:822:Qlzqqlzuup, the Lord of Flesh
@@ -14209,40 +18816,39 @@ I:130:50d100:30:1:0
 W:79:3:10000:20000
 E:0:0:0:0:0:0
 O:20:20:20:20
-F:UNIQUE | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | ATTR_MULTI | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_1 | 
-S:S_MONSTERS | S_ANGEL | S_HOUND | S_HYDRA | S_SPIDER | S_ANT | S_ANIMALS | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_WRAITH | S_UNIQUE | S_KIN
+F:ANIMAL
+F:ATTR_MULTI
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:RES_TELE
+F:UNIQUE
+S:1_IN_1
+S:S_ANGEL
+S:S_ANIMALS
+S:S_ANT
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_HOUND
+S:S_HYDRA
+S:S_KIN
+S:S_MONSTERS
+S:S_SPIDER
+S:S_UNIQUE
+S:S_WRAITH
 D:A gigantic seething mass of flesh, Qlzqqlzuup changes colours in front 
 D:of your eyes.  Pulsating first one colour then the next, it knows only it 
 D:must bring help to protect itself. 
 
-N:823:Cthugha, the Living Flame
-G:E:R
-I:133:50d100:30:1:20
-W:78:3:0:17500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:BLIND
-B:TOUCH:FIRE:12d10
-B:TOUCH:FIRE:12d10
-B:TOUCH:FIRE:12d10
-F:UNIQUE | RES_TELE | AURA_FIRE | IM_FIRE | CAN_FLY | RES_PLAS |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | SMART | ELDRITCH_HORROR |
-F:EVIL | KILL_ITEM | KILL_BODY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_FIRE | S_KIN
-D:"But even though we had shielded our eyes, it was impossible not 
-D:to see the great amorphous shapes streaming skyward from the 
-D:accursed place, nor the equally great being hovering like a cloud 
-D:of living fire above the trees." 
-
 N:824:Flare, rider of bronze Moonth
 G:B:U
 I:130:70d100:100:100:15
@@ -14253,15 +18859,44 @@ B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
-F:UNIQUE | MALE | THUNDERLORD | RES_TELE | CAN_FLY | CAN_SPEAK |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | PET | GOOD |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:SCARE | TPORT | TELE_TO | S_THUNDERLORD | 
-S:TELE_LEVEL | HEAL | BR_FIRE | BR_TIME | ROCKET
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:HEAL
+S:ROCKET
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:A leader from afar, he has come with his eagle to help you in 
 D:your battle. Having already saved his home, he now wants to save Arda! 
 
@@ -14275,49 +18910,45 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | EVIL | AI_SPECIAL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | KILL_WALL | MOVE_BODY | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_POIS | SPECIAL_GENE | 
-F:REGENERATE | REFLECTING | DROP_SKELETON | DROP_CORPSE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_6 | 
-S:S_MONSTERS | S_WRAITH | S_HI_UNDEAD | 
-S:S_HI_DRAGON | S_HI_DEMON | S_UNIQUE | S_ANIMALS
+F:AI_SPECIAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:The son of Eol the Dark Elf, Maeglin is every bit as evil as his father 
 D:and more.  His greed for gold led him to betray the Hidden Kingdom of 
 D:Gondolin to Morgoth's forces.  He is a mighty warrior himself, and some 
 D:of Morgoth's greatest servants answer to his call. 
 
-N:826:Cyaegha
-G:e:G
-I:130:64d100:90:120:10
-W:80:3:0:44444
-E:0:0:0:0:0:0
-O:20:50:30:0
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-F:UNIQUE | CAN_SPEAK | RES_TELE | ELDRITCH_HORROR | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | DEMON | IM_ACID | IM_ELEC |
-F:IM_COLD | IM_POIS | CTHANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_AWAY | BLIND | HOLD | SCARE |  BRAIN_SMASH | 
-S:BR_DARK | BA_DARK | BR_NETH | HAND_DOOM |
-S:S_HI_UNDEAD | S_DEMON | S_MONSTERS | S_HYDRA
-D:"...it was a gigantic eye staring down at them. Around the eye, 
-D:the sky split; deep clefts opened through which the darkness 
-D:began to ooze, a darkness blacker than the night, which crawled 
-D:down as a set of slimy tentacles, taking on more form, more 
-D:definite shape... something was standing, outlined against 
-D:the black sky, something which had tentacles of darkness 
-D:and a green-glowing eye." 
-
 N:827:Pazuzu, Lord of Air
 G:U:b
 I:140:55d100:40:125:10
@@ -14328,39 +18959,35 @@ B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_3 | 
-S:MIND_BLAST | BO_ELEC | BO_MANA | BA_ELEC | S_HI_DEMON
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:BA_ELEC
+S:BO_ELEC
+S:BO_MANA
+S:MIND_BLAST
+S:S_HI_DEMON
 D:A winged humanoid demon from the Planes of Hell, Pazuzu grins inhumanely at you 
 D:as he decides your fate. 
 
-N:828:Ithaqua the Windwalker
-G:Y:B
-I:140:55d100:40:125:10
-W:82:2:0:32500
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:CLAW:COLD:12d12
-B:CLAW:COLD:12d12
-B:CRUSH:ELEC:12d12
-B:CRUSH:ELEC:12d12
-F:UNIQUE | CAN_SPEAK | ESCORT | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_ELEC |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | NONLIVING |
-F:EVIL | DEMON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 | 
-S:BO_MANA | SCARE | BR_COLD | S_DEMON | BO_ELEC | BA_ELEC |
-S:MIND_BLAST | CAUSE_4 | BA_CHAO | BA_WATE | S_HI_UNDEAD | S_KIN
-D:The Wendigo, moving so fast that you can see little except two 
-D:glowing eyes burning with hatred. 
-
 N:829:Greater Hellhound
 G:C:r
 I:120:48d30:25:80:30
@@ -14370,11 +18997,21 @@ O:0:0:0:0
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils. 
 
 N:830:Cantoras, the Skeletal Lord
@@ -14387,42 +19024,46 @@ B:GAZE:EXP_80:5d5
 B:GAZE:EXP_80:5d5
 B:TOUCH:POISON:5d5
 B:TOUCH:POISON:5d5
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_TO | SLOW | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_ICEE | BO_MANA | BA_WATE | BA_NETH | 
-S:S_HI_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BA_WATE
+S:BO_ICEE
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:SLOW
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A legion of evil undead druj animating the skeleton of a once mighty 
 D:sorcerer. His power is devastating and his speed unmatched in the 
 D:underworld. Flee his wrath! 
 
-N:831:Mephistopheles, Lord of Hell
-G:U:r
-I:140:30d222:20:150:50
-W:84:2:0:42500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:GAZE:EXP_80:10d5
-B:GAZE:TERRIFY:10d5
-B:TOUCH:FIRE:4d15
-B:TOUCH:UN_POWER:4d15
-F:MALE | UNIQUE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:IM_FIRE | RES_PLAS | RES_NETH | AURA_FIRE |
-F:NO_CONF | NO_SLEEP | NONLIVING | EVIL | DEMON |
-F:ESCORTS | IM_COLD | IM_POIS | ZANGBAND | HAS_LITE
-S:1_IN_3 |
-S:TELE_TO | SCARE | HOLD | BRAIN_SMASH |
-S:S_DEMON | S_HI_UNDEAD | S_UNDEAD |
-S:BR_FIRE | BR_NETH | S_HI_DEMON | HAND_DOOM | ANIM_DEAD
-D:A duke of hell, in the flesh. 
-
 N:832:Godzilla
 G:R:v
 I:130:85d100:50:185:20
@@ -14433,138 +19074,37 @@ B:CLAW:POISON:5d10
 B:CLAW:POISON:5d10
 B:BITE:HURT:20d10
 B:CRUSH:UN_BONUS:5d12
-F:UNIQUE | CAN_SWIM | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | RES_PLAS | RES_DISE | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS
-F:MORTAL | JOKEANGBAND
-S:1_IN_2 | 
-S:BR_DISE | BR_PLAS | BR_NUKE | BR_POIS | BR_ACID
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_DISE
+F:RES_PLAS
+F:RES_TELE
+F:UNIQUE
+S:1_IN_2
+S:BR_ACID
+S:BR_DISE
+S:BR_NUKE
+S:BR_PLAS
+S:BR_POIS
 D:Godzilla rose from the contaminated sea.  This terrible creature could 
 D:level whole cities in anger.
 
-N:833:Abhoth, Source of Uncleanness
-G:j:G
-I:130:80d105:50:150:0
-W:85:3:0:40000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:ACID:11d11
-B:TOUCH:DISEASE:11d11
-B:TOUCH:ACID:11d11
-B:TOUCH:POISON:11d11
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR |
-F:COLD_BLOOD | RES_DISE | NO_STUN | CTHANGBAND | NO_CUT
-S:1_IN_6 |
-S:S_MONSTERS | S_DEMON | S_HI_DRAGON | S_HI_UNDEAD | HEAL |
-S:TELE_AWAY | TPORT | CAUSE_4 | BRAIN_SMASH | DRAIN_MANA | 
-S:BR_NUKE | BR_POIS | BR_CHAO | BR_NEXU | ANIM_DEAD
-D:"...in the pool [there was] a grayish, horrid mass that nearly choked 
-D:it from rim to rim. Here, it seemed, was the ultimate source of all 
-D:miscreation and abomination. For the gray mass quobbed and quivered, 
-D:and swelled perpetually; and from it, in manifold fission, were 
-D:spawned the anatomies that crept away on every side through the 
-D:grotto." 
-
-N:834:Ymir, the Ice Giant
-G:P:w
-I:130:86d110:50:160:20
-W:71:2:0:32500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:COLD:9d11
-B:HIT:HURT:9d11
-B:HIT:COLD:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | CAN_SPEAK | SUSCEP_FIRE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_WATE | MALE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | ESCORT | GIANT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | RES_DISE |
-F:EVIL | IM_COLD | IM_POIS | SUSCEP_FIRE | 
-F:COLD_BLOOD | AURA_COLD | DROP_CORPSE | ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BR_COLD | BO_ICEE | DARKNESS | TELE_TO | S_KIN | S_HI_UNDEAD | 
-S:TELE_AWAY | HAND_DOOM
-D:Ymir is one of the oldest beings in existence. He looks like a giant 
-D:humanoid made of ice. 
-
-N:835:Loki, the Trickster
-G:P:D
-I:130:110d100:50:160:20
-W:85:2:0:75000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:HIT:BLIND:6d11
-B:HIT:UN_BONUS:6d11
-B:HIT:UN_POWER:6d11
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | EVIL | AURA_FIRE |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | SUSCEP_COLD | GIANT | 
-F:REGENERATE | ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:SHRIEK | HASTE | HEAL | DRAIN_MANA | TPORT | TELE_TO | TELE_AWAY |
-S:TELE_LEVEL | FORGET | S_HI_DEMON | HAND_DOOM | S_HI_UNDEAD |
-S:S_UNIQUE | S_HI_DRAGON | BA_DARK | BA_MANA | ANIM_DEAD
-D:Loki, the god of mischief, is a nasty person. He will use every 
-D:dirty trick in the book, and then some. In the end, his half-giant 
-D:heritage is bound to show, as he will defect to the side of the 
-D:giants and fight against the other gods of Asgard. 
-
-N:836:Star-spawn of Cthulhu
-G:U:G
-I:130:75d100:90:90:90
-W:86:2:0:44000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CLAW:POISON:1d30
-B:CLAW:ACID:1d30
-B:TOUCH:UN_POWER:1d10
-B:CRUSH:UN_BONUS:2d33
-F:RAND_25 | KILL_ITEM | OPEN_DOOR | BASH_DOOR | RES_NETH | ELDRITCH_HORROR |
-F:DROP_1D2 | DROP_2D2 | DROP_90 | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP |
-F:EVIL | DEMON | IM_POIS | IM_COLD | IM_ACID | IM_ELEC | RES_TELE | NONLIVING |
-F:POWERFUL | IM_FIRE | CAN_SWIM | CTHANGBAND
-S:1_IN_3
-S:SCARE | CONF | S_DEMON | S_UNDEAD | DRAIN_MANA | BR_ACID |
-S:BR_FIRE | TPORT | S_MONSTERS | BRAIN_SMASH | BR_NETH |
-S:HEAL | MIND_BLAST | BA_NUKE | ANIM_DEAD
-D:The last remnants of sanity threaten to leave your brain as you 
-D:behold this titanic bat-winged, octopus-headed unholy abomination. 
-D:"They all lay in stone houses in their great city of R'lyeh, 
-D:preserved by the spells of mighty Cthulhu for a glorious 
-D:resurrection when the stars and the earth might once more 
-D:be ready..." 
-
-N:837:Surtur, the Fire Giant
-G:P:r
-I:130:86d110:50:160:20
-W:71:2:0:32500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:FIRE:9d11
-B:HIT:HURT:9d11
-B:HIT:FIRE:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | AURA_FIRE |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | SUSCEP_COLD | GIANT | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_FIRE | BR_PLAS | BLIND | TELE_TO | S_KIN | 
-S:HAND_DOOM | TELE_AWAY | S_HI_DEMON
-D:Surtur is another of the most ancient of all creatures. He is a demonic 
-D:giant of fire, who is destined to set the nine worlds afire with his 
-D:accursed sword of doom on the day of Ragnarok. 
-
 N:838:The Tarrasque
 G:R:v
 I:130:130d100:50:185:20
@@ -14575,13 +19115,27 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:UN_POWER:10d10
 B:TOUCH:UN_POWER:10d10
-F:UNIQUE | ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_COLD | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BR_FIRE | BR_COLD | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_2
+S:BR_COLD
+S:BR_DISE
+S:BR_FIRE
 D:The Tarrasque is a massive reptile of legend, rumoured to be unkillable 
 D:and immune to magic. Fear its anger, for its devastation is unmatched! 
 
@@ -14595,17 +19149,36 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | BR_PLAS | 
-S:S_HI_DEMON | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_UNDEAD
 D:A massive form cloaked in flame. Lungorthin stares balefully at you with 
 D:eyes that smoulder red. The dungeon floor where he stands is scorched by 
 D:the heat of his body. 
@@ -14620,65 +19193,32 @@ B:CLAW:HURT:6d8
 B:CLAW:HURT:6d8
 B:BITE:POISON:6d6
 B:BITE:POISON:6d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:SCARE | S_MONSTERS | S_HOUND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_3
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
 D:Draugluin provides Sauron with a fearsome personal guard. He is an 
 D:enormous wolf inhabited by a human spirit. He is chief of all his kind. 
 
-N:841:Shuma-Gorath
-G:e:G
-I:130:85d100:50:150:0
-W:88:3:0:47000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CRUSH:HURT:12d12
-B:CRUSH:HURT:12d12
-B:GAZE:LOSE_INT:2d12
-B:GAZE:LOSE_WIS:2d12
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR |
-F:COLD_BLOOD | RES_DISE | CTHANGBAND | NO_CUT
-S:1_IN_2 |
-S:FORGET | HEAL | HAND_DOOM | BA_MANA | TPORT | TELE_AWAY |
-S:TELE_LEVEL | CONF | BLIND | BRAIN_SMASH | DRAIN_MANA |
-S:S_MONSTERS | S_KIN | S_HI_DEMON | S_HOUND | S_HYDRA | 
-S:S_UNIQUE | S_HI_UNDEAD | S_HI_DRAGON | ANIM_DEAD
-D:Shuma-Gorath is one of the immortal lords of chaos. The true form of 
-D:this blasphemous horror is a huge, all-seeing eye surrounded by tentacles. 
-
-N:842:Tulzscha, the Green Flame
-G:E:G
-I:130:100d100:90:100:50
-W:89:4:0:45000
-E:0:0:0:0:0:0
-O:0:100:0:0
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-F:RAND_25 | EVIL | DEMON | AURA_FIRE | AURA_COLD | ELDRITCH_HORROR |
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | 
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING | 
-F:IM_COLD | IM_ACID | IM_ELEC | RES_NEXU | RES_NETH | RES_PLAS | 
-F:REGENERATE | UNIQUE | CTHANGBAND | HAS_LITE | NO_CUT | NO_SLEEP | NO_FEAR
-S:1_IN_3 |
-S:BR_NEXU | BR_NETH | BR_COLD | BR_FIRE
-D:"A belching column of sick greenish flame... spouting volcanically 
-D:from the depths profound and inconceivable, casting no shadows as 
-D:healthy flame should, and coating the nitrous stone with a nasty, 
-D:venomous verdigris. For all that seething combustion no warmth 
-D:lay, but only the clamminess of death and corruption." 
-
 N:843:Oremorj, the Cyberdemon Lord
 G:U:u
 I:130:90d100:90:90:90
@@ -14689,12 +19229,27 @@ B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 B:HIT:HURT:2d50
-F:RAND_25 | EVIL | DEMON | SUSCEP_ACID |
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | DROP_GREAT | UNIQUE | NO_SLEEP |
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING | JOKEANGBAND | 
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
 F:HAS_LITE
-S:1_IN_3 |
-S:ROCKET | S_HI_DEMON
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_SLEEP
+F:ONLY_ITEM
+F:RAND_25
+F:RES_TELE
+F:SUSCEP_ACID
+F:UNIQUE
+S:1_IN_3
+S:ROCKET
+S:S_HI_DEMON
 D:The mightiest of Cyberdemons, their lord and ruler. 
 
 N:844:Vecna, the Emperor Lich
@@ -14707,67 +19262,49 @@ B:HIT:EXP_80:7d12
 B:HIT:LOSE_DEX:7d12
 B:HIT:UN_POWER:7d12
 B:HIT:UN_POWER:7d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:TPORT | BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_FIRE | BA_NETH | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_KIN | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:TPORT
 D:The greatest of all undead sorcerers, even the gods once feared him.  This 
 D:ancient shadow of death wilts every living thing it passes. 
 
-N:845:Yog-Sothoth, the All-in-One
-G:j:v
-I:130:66d99:100:100:20
-W:90:3:0:45000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:HURT:40d5
-B:TOUCH:LOSE_CON:16d2
-B:TOUCH:LOSE_CON:16d2
-F:UNIQUE | CAN_SPEAK | SMART | ELDRITCH_HORROR | RES_TELE
-F:PASS_WALL | FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_FIRE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | ATTR_MULTI | ATTR_ANY | AURA_COLD |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY |
-F:EVIL | IM_ACID | IM_COLD | IM_ELEC | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP
-F:CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_3 |
-S:BO_MANA | BRAIN_SMASH | BA_MANA | S_MONSTERS | S_HI_DEMON |
-S:BA_CHAO | S_DEMON | S_HI_UNDEAD | S_HOUND | BR_MANA | BR_DISI
-D:"Great globes of light massing towards the opening... the breaking 
-D:apart of the nearest globes, and the protoplasmic flesh that 
-D:flowed blackly outward to join together and form that eldritch, 
-D:hideous horror from outer space... whose mask was a congeries 
-D:of iridescent globes... who froths as primal slime in nuclear 
-D:chaos forever beyond the nethermost outposts of space and time!" 
-
-N:846:Fenris Wolf
-G:C:D
-I:130:70d100:80:90:40
-W:90:2:0:35000
-E:0:1:0:2:1:0
-O:20:0:80:0
-B:BITE:HURT:20d6
-B:CLAW:HURT:8d8
-B:CLAW:HURT:8d8
-B:BITE:HURT:20d6
-F:UNIQUE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | KILL_BODY | NO_SLEEP
-F:ANIMAL | EVIL | IM_POIS | IM_FIRE | IM_COLD | ZANGBAND
-S:1_IN_8 | 
-S:BR_DARK | BR_POIS | BR_COLD
-D:The immensely huge wolf who would swallow the sun to satisfy its 
-D:hunger - and leave the gods for dessert. 
-
 N:847:Great Wyrm of Power
 G:D:v
 I:130:111d111:40:160:70
@@ -14778,69 +19315,69 @@ B:CLAW:HURT:8d12
 B:CLAW:HURT:8d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_4 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+S:1_IN_4
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:The mightiest of all dragonkind, a great wyrm of power is seldom 
 D:encountered in our world. It can crush stars with its might. 
 
-N:848:Shub-Niggurath, Black Goat of the Woods
-G:U:D
-I:130:65d99:100:100:20
-W:91:3:0:47500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CRUSH:LOSE_WIS:20d5
-B:CRUSH:LOSE_INT:20d5
-B:BITE:LOSE_STR:10d2
-B:BITE:LOSE_CON:10d2
-F:UNIQUE | CAN_SPEAK | FEMALE | ELDRITCH_HORROR | AURA_ELEC | RES_TELE | 
-F:ATTR_MULTI | FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | ATTR_ANY | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | NONLIVING | CAN_FLY |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | DEMON | AURA_COLD | 
-F:EVIL | IM_ACID | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 |
-S:BO_MANA | BRAIN_SMASH | BA_DARK | S_MONSTERS |
-S:CAUSE_4 | HEAL | BR_CHAO | BR_CONF | BR_POIS | BR_NUKE |
-S:BA_CHAO | S_HI_DEMON | S_HI_UNDEAD | S_UNIQUE | ANIM_DEAD
-D:This horrendous outer god looks like a writhing cloudy mass filled 
-D:with mouths and tentacles. 
-
-N:849:Nodens, Lord of the Great Abyss
-G:P:W
-I:130:75d99:100:100:20
-W:81:3:0:48000
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-F:UNIQUE | CAN_SPEAK | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:GOOD | IM_ACID | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC |
-F:RES_NEXU | RES_NETH | RES_WATE | ZANGBAND | HAS_LITE
-S:1_IN_1 |
-S:TELE_AWAY | TELE_TO | TELE_LEVEL | TPORT |
-S:BO_MANA | BA_MANA | S_MONSTERS | HEAL |
-S:CAUSE_4 | HASTE | HAND_DOOM | 
-S:S_ANGEL | S_UNIQUE
-D:The hoary Lord of the Great Abyss seems a wizened man, 
-D:but appearances can be deceiving. 
-
 N:850:Carcharoth, the Jaws of Thirst
 G:C:D
 I:130:90d100:80:110:10
@@ -14851,74 +19388,34 @@ B:CLAW:POISON:9d12
 B:CLAW:POISON:9d12
 B:BITE:FIRE:9d12
 B:BITE:FIRE:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_FIRE |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:BR_DARK | BR_POIS | BR_FIRE | BR_NETH | S_HOUND
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BR_DARK
+S:BR_FIRE
+S:BR_NETH
+S:BR_POIS
+S:S_HOUND
 D:The first guard of Angband, Carcharoth, also known as 'The Red Maw', is 
 D:the largest wolf to ever walk the earth. He is highly intelligent and a 
 D:deadly opponent in combat. 
 
-N:851:Nyarlathotep, the Crawling Chaos
-G:U:r
-I:130:90d99:100:100:20
-W:93:3:0:49000
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:LOSE_CON:30d4
-B:CRUSH:LOSE_STR:30d4
-B:GAZE:LOSE_INT:1d50
-B:GAZE:LOSE_WIS:1d50
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | DEMON | RES_NEXU |
-F:SHAPECHANGER | ATTR_MULTI | ATTR_ANY | MALE | AURA_ELEC |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | DROP_90 |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | AURA_COLD |
-F:EVIL | IM_ACID | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 |
-S:TELE_AWAY | TELE_TO | TELE_LEVEL | TPORT | BR_NEXU | BA_CHAO |
-S:BA_MANA | BA_FIRE | S_MONSTERS | BRAIN_SMASH | MIND_BLAST |
-S:CAUSE_4 | HASTE | S_HI_UNDEAD | S_HI_DRAGON | ANIM_DEAD | 
-S:S_ANGEL | HEAL | S_SPIDER | S_HOUND | S_HI_DEMON | HAND_DOOM
-D:Nyarlathothep is the messenger, the heart and the soul of the outer gods. 
-D:He is a shapechanger capable of assuming thousands of nightmarish forms. 
-D:One of them looks like this: "A tall, slim figure with the young face of 
-D:an antique pharaoh, gay with prismatic robes and crowned with a 
-D:pshent that glowed with inherent light... the fascination of a 
-D:dark god or fallen archangel, and around whose eyes there lurked 
-D:the languid sparkle of capricious humor." 
-
-N:852:Azathoth, the Daemon Sultan
-G:E:B
-I:130:99d99:100:150:100
-W:93:3:0:50000
-E:0:0:0:0:0:0
-O:0:50:0:50
-B:CRUSH:HURT:35d5
-B:CRAWL:ACID:35d5
-B:CRUSH:HURT:35d5
-B:CRAWL:ACID:35d5
-F:UNIQUE | ELDRITCH_HORROR | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | DEMON | AURA_FIRE | AURA_ELEC |
-F:ATTR_MULTI | ESCORTS | ESCORT | POWERFUL | ATTR_ANY | NONLIVING |
-F:KILL_ITEM | KILL_WALL | CAN_SWIM | AURA_COLD
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | RES_DISE |
-F:STUPID | OPEN_DOOR | BASH_DOOR | REGENERATE | EMPTY_MIND |
-F:EVIL | IM_ACID | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | NO_STUN | CTHANGBAND
-F:HAS_LITE | NO_CUT
-S:1_IN_5 |
-S:S_DEMON | BR_CHAO | BR_DISE | BR_MANA | BA_WATE | BR_DISI
-D:"That last amorphous blight of nethermost confusion which 
-D:blasphemes and bubbles at the centre of all infinity -- 
-D:the boundless daemon sultan Azathoth, whose name no lips 
-D:dare speak aloud, and who gnaws hungrily in inconceivable, 
-D:unlighted chambers beyond time amidst the muffled, maddening 
-D:beating of vile drums and the thin monotonous whine of 
-D:accursed flutes." 
-
 N:853:Huan, Wolfhound of the Valar
 G:C:W
 I:130:90d100:50:160:10
@@ -14929,117 +19426,85 @@ B:CLAW:COLD:9d12
 B:CLAW:COLD:9d12
 B:BITE:COLD:9d12
 B:BITE:COLD:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_COLD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | KILL_BODY | 
-F:ANIMAL | GOOD |
-F:IM_COLD | IM_ACID | IM_ELEC | BASEANGBAND
-S:1_IN_5 | 
-S:BR_COLD | BR_SHAR | BR_SOUN | BR_LITE | 
+F:ANIMAL
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:KILL_BODY
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_5
+S:BR_COLD
+S:BR_LITE
+S:BR_SHAR
+S:BR_SOUN
 D:The wolfhound of the Valar, Huan has served many masters in his time, from 
 D:Celegorm son of Feanor to Beren son of Barahir: but now he runs wild and 
 D:acknowledges no master save himself, as he hunts alone for his nemesis - 
 D:Carcharoth, the terrible wolf of Angband. 
 
-N:854:Jormungand the Midgard Serpent
-G:J:v
-I:130:120d120:100:200:0
-W:94:1:3000:45000
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CRUSH:HURT:20d10
-B:CRUSH:HURT:20d10
-B:BITE:HURT:5d50
-F:UNIQUE | FORCE_MAXHP | FORCE_SLEEP | WILD_TOO | WILD_OCEAN | WILD_SWAMP | 
-F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_POIS | IM_ACID | IM_COLD | COLD_BLOOD | 
-F:RES_WATE | RES_PLAS | RES_NEXU | NO_STUN | REGENERATE | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_3
-S:BA_WATE | BR_MANA | BR_NETH | BR_POIS | BR_DISI | S_KIN
-D:The Midgard Serpent is so huge that its body surrounds the world of 
-D:mortal men. It could grind even the gods into lifeless pulp. 
-
-N:855:The Destroyer
-G:g:v
-I:130:140d140:100:200:0
-W:94:1:0:45000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-F:UNIQUE | NONLIVING | NO_FEAR | FORCE_MAXHP | FORCE_SLEEP | REFLECTING |
-F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | IM_COLD |
-F:RES_NETH | RES_WATE | RES_PLAS | RES_NEXU | NO_STUN | REGENERATE |
-F:NO_CONF | NO_SLEEP | NO_STUN | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BR_DISI | BO_MANA
-D:The Destroyer was built by the Norse deities to be their ultimate weapon 
-D:against the space gods who had arrived to judge the world. Unfortunately, 
-D:the Destroyer has gone berserk and is destroying everything it sees. The 
-D:mystical Destroyer is nearly indestructible, and it is said that when it 
-D:uses its power of complete disintegration, the day of Ragnarok is near. 
-
 N:856:Gothmog, the High Captain of Balrogs
 G:U:v
 I:130:120d100:100:140:0
 W:95:1:17000:43000
 E:1:1:1:2:1:1
 O:0:100:0:0
+A:123:50
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | S_KIN |
-S:S_HI_DEMON | S_HI_UNDEAD
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
 D:Gothmog is the Chief Balrog in Morgoth's personal guard. He is renowned 
 D:for slaying three High Kings of the Noldor Elves, and he has never been 
 D:defeated in combat. With his whip of flame and awesome fiery breath he 
 D:saved his master from Ungoliant's rage. 
 
-N:857:Great Cthulhu
-G:U:g
-I:130:100d100:100:140:100
-W:97:2:4000:62500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:HURT:50d4
-B:CLAW:UN_POWER:15d2
-B:CLAW:UN_BONUS:15d2
-B:TOUCH:DISEASE:100d1
-F:UNIQUE | CAN_SPEAK | DEMON | ELDRITCH_HORROR | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ESCORT | ESCORTS | SMART | RES_PLAS | RES_NEXU |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | REGENERATE | RES_NETH |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_1D2 | DROP_GOOD |
-F:DROP_GREAT | RES_DISE | RES_TELE | CAN_SWIM |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | NO_CONF | NO_SLEEP |
-F:CTHANGBAND
-S:1_IN_3
-S:TPORT | SCARE | BLIND | MIND_BLAST | BRAIN_SMASH | DRAIN_MANA |
-S:BR_POIS | BR_ACID | BR_FIRE | CONF | DARKNESS | FORGET | S_HI_UNDEAD |
-S:BR_NUKE | BR_NETH | BR_CHAO | BR_DISE | BR_DARK | BR_PLAS | BR_CONF
-S:BR_NEXU | S_HI_DEMON | BR_DISI | HAND_DOOM | 
-S:ANIM_DEAD
-D:This creature is death incarnate. "A monster of vaguely anthropoid 
-D:outline, but with an octopus-like head whose face was a mass of 
-D:feelers, a scaly, rubbery-looking body, prodigious claws on hind 
-D:fore feet, and long, narrow wings behind. This thing... was a 
-D:somewhat bloated corpulence... It lumbered slobberingly into sight 
-D:and gropingly squeezed its gelatinous green immensity through the 
-D:black doorway... A mountain shambled or walked." 
-
 N:858:Sarko, rider of gold Foronth
 G:B:y
 I:145:99d111:100:165:0
@@ -15050,42 +19515,51 @@ B:HIT:HURT:12d12
 B:HIT:HURT:12d12
 B:HIT:FIRE:12d12
 B:HIT:FIRE:12d12
-F:UNIQUE | FEMALE | DROP_CORPSE | 
-F:ATTR_MULTI | THUNDERLORD | RES_TELE | PET | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | GOOD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:DROP_CHOSEN | REFLECTING | AURA_FIRE | AURA_ELEC | 
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | POWERFUL |
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TPORT | TELE_TO | BR_FIRE | BR_TIME | S_THUNDERLORD | TELE_AWAY |
+F:ATTR_MULTI
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Foronth is the first Eagle queen, and Sarko the first to discover 
 D:the Firebirds, the ancestor of the Thunderlord eagles. She will try to 
 D:help you! 
 
-N:859:The Unicorn of Order
-G:q:w
-I:130:66d100:30:170:150
-W:75:2:0:65000
-E:0:1:0:2:1:0
-O:25:50:25:0
-B:KICK:UN_POWER:13d13
-B:KICK:UN_POWER:12d12
-B:BUTT:UN_BONUS:11d11
-B:BITE:TIME:10d10
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | REFLECTING | AURA_COLD | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | KILL_BODY | POWERFUL | BASH_DOOR | REGENERATE | CAN_FLY |
-F:ANIMAL | GOOD | IM_ACID | IM_COLD | IM_ELEC | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | ZANGBAND
-S:1_IN_3 | 
-S:BR_SOUN | BR_LITE | BR_TIME | BR_SHAR | BR_MANA | 
-S:S_MONSTERS | HEAL | S_ANGEL
-D:The Unicorn of Order, who once stole an eye from the great Serpent 
-D:of Chaos, regards you as a mortal meddling in the affairs of immortals, 
-D:and thus is attempting to eliminate you. 
-
 N:860:Sauron, the Sorcerer
 G:p:v
 I:130:100d225:100:160:0
@@ -15096,18 +19570,59 @@ B:HIT:UN_BONUS:10d12
 B:HIT:UN_BONUS:10d12
 B:HIT:UN_POWER:8d12
 B:HIT:UN_POWER:8d12
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING |
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | NO_SLEEP | NO_FEAR | NO_CONF |
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | TELE_LEVEL | BLIND | CONF | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | FORGET | BO_ICEE | BO_MANA | BO_PLAS | 
-S:BA_MANA | BA_FIRE | BA_WATE | BA_NETH | BA_DARK | BA_CHAO | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | S_WRAITH | S_UNIQUE | 
-S:HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_LEVEL
+S:TPORT
 D:Mighty in spells and enchantments, he created the One Ring. 
 D:His eyes glow with power and with his gaze he seeks to destroy 
 D:your soul. He has many servants, and rarely fights without them. 
@@ -15122,21 +19637,73 @@ B:GAZE:EAT_GOLD:20d10
 B:HIT:SHATTER:20d10
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | MALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE | 
-F:REGENERATE | CAN_FLY | CAN_SWIM | DG_CURSE | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF |NO_FEAR | NO_STUN | RES_TELE
-F:MORTAL | JOKEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:S_THUNDERLORD | BR_CHAO | BA_CHAO | ROCKET | BRAIN_SMASH | S_HI_DEMON | 
-S:BR_NETH | HASTE | BR_MANA | S_HI_UNDEAD | S_HI_DRAGON | TRAPS | FORGET | 
-S:BR_NUKE | BR_POIS | BR_DISI | HAND_DOOM | HEAL | TPORT | TELE_TO |
-S:S_BUG | S_RNG |
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BA_CHAO
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_DISI
+S:BR_MANA
+S:BR_NETH
+S:BR_NUKE
+S:BR_POIS
+S:FORGET
+S:HAND_DOOM
+S:HASTE
+S:HEAL
+S:ROCKET
+S:S_BUG
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_RNG
+S:S_THUNDERLORD
+S:TELE_TO
+S:TPORT
 D:He is the master of coding; none can match his skill. He created the 
 D:Variant Maintainer, the RNGs, and the software bugs. Bull Gates is 
 D:nothing next to him. Do not think that since he loves the novels of 
@@ -15154,19 +19721,56 @@ B:HIT:SHATTER:24d10
 B:HIT:SHATTER:24d10
 B:HIT:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_COLD |
-F:REGENERATE | POWERFUL |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | 
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:ROCKET | BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH
+F:AURA_COLD
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:HAND_DOOM
+S:ROCKET
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:He is the Master of the Pits of Angband. His figure is like a black 
 D:mountain crowned with Lightning. He rages with everlasting anger, his 
@@ -15187,12 +19791,17 @@ W:0:20:1700:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:5d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the human kings. 
 D:They will help you in some quests. 
 
@@ -15203,14 +19812,22 @@ W:0:20:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_1 |
-S:ARROW_2 | ARROW_1 | ARROW_2 | ARROW_1 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
+S:1_IN_1
+S:ARROW_1
+S:ARROW_1
+S:ARROW_2
+S:ARROW_2
 D:They are used as the main assault force of the elven kings. 
 D:They will help you in some quests. 
 
@@ -15221,12 +19838,17 @@ W:0:20:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:6d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the dwarven kings. 
 D:They will help you in some quests. 
 
@@ -15238,12 +19860,20 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 |
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_8
 S:ARROW_2
 D:It is a cunning orc of power, taller than a man, and stronger. It fears 
 D:little. 
@@ -15258,13 +19888,33 @@ B:GAZE:CONFUSE:15d5
 B:GAZE:PARALYZE:15d5
 B:TOUCH:INSANITY:5d5
 B:TOUCH:EXP_40:5d5
-F:FEMALE | UNIQUE | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | WEIRD_MIND | DROP_SKELETON | DROP_CORPSE |
-F:EVIL | NO_CONF | NO_SLEEP | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:UNIQUE
+F:WEIRD_MIND
 S:1_IN_3
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_TIME |
-S:HOLD | SCARE | SLOW | CONF | FORGET
+S:BR_CHAO
+S:BR_CONF
+S:BR_SOUN
+S:BR_TIME
+S:CONF
+S:FORGET
+S:HOLD
+S:SCARE
+S:SLOW
 D:She is a feared teacher, mistress of chaos and strangely minded. 
 D:She wants to take your mind. Fear her and flee while you can.
 
@@ -15277,12 +19927,24 @@ O:20:20:20:20
 B:INSULT:*
 B:HIT:INSANITY:1d8
 B:HIT:LOSE_WIS:1d8
-F:ONLY_ITEM | DROP_2D2 | UNIQUE | CAN_FLY |
-F:DROP_GOOD | WEIRD_MIND | CAN_SPEAK |
-F:RAND_50 | RAND_25 | INVISIBLE | EVIL |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:HAS_LITE
+F:INVISIBLE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:RAND_25
+F:RAND_50
+F:UNIQUE
+F:WEIRD_MIND
 S:1_IN_2
-S:S_BUG | S_RNG | BR_CONF
+S:BR_CONF
+S:S_BUG
+S:S_RNG
 D:A deranged programmer, scattering bizarre ideas and bad code everywhere. 
 
 N:869:Random Number Generator
@@ -15294,8 +19956,12 @@ O:20:20:20:20
 B:INSULT:*
 B:MOAN:*
 B:HIT:CONFUSE:1d6
-F:DROP_1D2 | EVIL |
-F:EMPTY_MIND | RAND_50 | RAND_25 | JOKEANGBAND
+F:DROP_1D2
+F:EMPTY_MIND
+F:EVIL
+F:JOKEANGBAND
+F:RAND_25
+F:RAND_50
 S:MULTIPLY
 D:A feared creation of the Variant Maintainer, it tries to generate Morgoth 
 D:in the town and the One Ring in the magic shop. 
@@ -15307,10 +19973,19 @@ W:50:10:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_4
-S:ROCKET | ARROW_4
+S:ARROW_4
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:871:Bouncing mine
@@ -15320,10 +19995,23 @@ W:70:10:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_3
-S:ROCKET | ARROW_4 | BLINK | BR_POIS | BR_CHAO | BR_NEXU
+S:ARROW_4
+S:BLINK
+S:BR_CHAO
+S:BR_NEXU
+S:BR_POIS
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:872:Durin's Bane
@@ -15332,21 +20020,43 @@ I:130:30d100:20:100:80
 W:50:3:13000:30000
 E:1:1:1:2:1:1
 O:0:50:50:0
+A:71:60
 B:HIT:FIRE:6d12
 B:HIT:FIRE:6d12
 B:CRUSH:HURT:5d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | SPECIAL_GENE | DROP_RANDART
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | 
-F:ESCORT | ESCORTS | DROP_CORPSE | NONLIVING | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CHOSEN | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | SCARE | 
-S:BR_FIRE | 
-S:S_UNDEAD | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_DEMON
+S:S_UNDEAD
 D:A huge Balrog surrounded by raging pillars of fire, this is indeed a 
 D:terrible opponent. Wielding a great whip of fire and a blazing sword, his 
 D:fury blisters your skin and melts your flesh! 
@@ -15361,14 +20071,34 @@ B:CRAWL:POISON:3d4
 B:CRAWL:EAT_FOOD:3d4
 B:TOUCH:ACID:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | FEMALE | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_CORPSE |
-F:WEIRD_MIND | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:DRAIN_MANA | BLIND | CONF | SCARE | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_5
+S:BLIND
+S:CONF
+S:DRAIN_MANA
+S:SCARE
+S:S_KIN
 D:And you thought her offspring were icky! 
 
 N:874:Rot jelly
@@ -15379,10 +20109,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_FOOD:2d3
 B:TOUCH:LOSE_CHR:2d3
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM | 
-F:HURT_LITE | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of rotting flesh, whose touch spoils your food.  The terrible 
 D:smell it exudes is also very hard to get rid of... 
 
@@ -15396,11 +20132,23 @@ B:HIT:HURT:20d5
 B:HIT:HURT:20d5
 B:TOUCH:EXP_80:20d5
 B:TOUCH:EXP_80:20d5
-F:UNIQUE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:"And I looked, and behold a pale horse: and his name that sat on him was
 D:Death, and Hell followed with him. And power was given unto them over the
 D:fourth part of the earth, to kill with sword, and with hunger, and with
@@ -15416,11 +20164,24 @@ B:TOUCH:EAT_FOOD:20d4
 B:GAZE:UN_BONUS:20d4
 B:WAIL:LOSE_INT:10d5
 B:WAIL:LOSE_DEX:10d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_STUN | NO_SLEEP | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:One of the horsemen of the apocalypse, before you lies Famine. A 
 D:figure so gaunt that the shape of the bones beneath are revealed, 
 D:Famine rides a pale grey mare that appears near death. 
@@ -15435,13 +20196,27 @@ B:TOUCH:POISON:20d4
 B:TOUCH:POISON:20d4
 B:TOUCH:DISEASE:16d5
 B:TOUCH:DISEASE:16d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
-S:S_ANT | S_SPIDER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:S_ANT
+S:S_SPIDER
 D:One of the horsemen of the apocalypse, before you lies Pestilence. 
 D:At first, it looks like a human, but then you notice ants, worms, and 
 D:worse peeking out of the flesh. Pestilence rides a purple horse with 
@@ -15457,12 +20232,26 @@ B:TOUCH:PARALYZE:20d4
 B:WAIL:CONFUSE:20d4
 B:GAZE:BLIND:20d4
 B:WAIL:TERRIFY:20d4
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF | NO_FEAR |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
 S:S_MONSTER
 D:One of the horsemen of the apocalypse, before you lies War. A healthy and 
 D:hearty warrior, War grins a little too wide at you as he prepares for 
@@ -15478,8 +20267,12 @@ W:2:1:100:7
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d3
-F:ANIMAL | AQUATIC  | STUPID | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
 D:It's a common fresh-water predatory fish. 
 
 N:880:Electric eel
@@ -15491,9 +20284,15 @@ O:0:0:0:0
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
-F:AQUATIC | ANIMAL | RAND_25 | IM_ELEC | RES_WATE | 
-F:WILD_TOO | WILD_OCEAN | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:This serpentine creature can create a deadly voltage.  Better watch out! 
 
 N:881:Giant crayfish
@@ -15504,25 +20303,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:HURT:3d4
-F:ANIMAL | AQUATIC | STUPID | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
+F:WEIRD_MIND
 D:A man-sized, heavily armoured fresh-water relative of the lobster. 
 
-N:882:Mermaid
-G:h:G
-I:110:5d8:50:30:0
-W:4:1:1600:20
-E:1:1:1:2:1:0
-O:20:50:10:5
-B:TOUCH:LOSE_WIS
-B:TOUCH:INSANITY:2d3
-B:TOUCH:CONFUSE
-F:FEMALE | RAND_25 | DROP_60 | SMART | AQUATIC | NO_CONF | DROP_CORPSE |
-F:MORTAL | ZANGBAND
-D:A green-skinned humanoid with a fishtail. Beware - there are rumours 
-D:of adventures losing their minds under the fearsome 
-D:charms of mermaids. 
-
 N:883:Box jellyfish
 G:~:B
 I:110:10d10:20:30:75
@@ -15531,8 +20320,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:PARALYZE:1d6
 B:TOUCH:PARALYZE:1d6
-F:ANIMAL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 D:A strange water creature, whose touch can be deadly. 
 
 N:884:Giant piranha
@@ -15543,9 +20336,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:5d1
 B:BITE:HURT:5d1
-F:NO_SLEEP | WILD_TOO | COLD_BLOOD | 
-F:FRIENDS | AQUATIC | ANIMAL | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:WILD_TOO
 D:A very large and bloodthirsty fish. 
 
 N:885:Piranha
@@ -15555,8 +20352,12 @@ W:3:1:200:8
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FRIENDS | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:WILD_TOO
 D:Bloodthirsty fish who can smell your blood from a great distance. 
 
 N:886:Bullywug
@@ -15567,8 +20368,16 @@ E:1:1:1:2:1:1
 O:30:40:10:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE | FRIENDS | 
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD 
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
 D:A vaguely humanoid creature, it looks like a cross between a hobbit and a 
 D:frog. 
 
@@ -15580,8 +20389,15 @@ E:1:1:1:2:1:1
 O:15:60:10:10
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
 D:A member of the frog-people clan. He is wielding a long, sharp shark tooth. 
 
 N:888:Bullywug shaman
@@ -15592,10 +20408,23 @@ E:1:1:1:2:1:1
 O:25:10:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD
-S:1_IN_5 |
-S:BLIND | CONF | DARKNESS | BO_COLD | HEAL | MISSILE | CAUSE_2
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:A leader of a clan of frog-people, he is cloaked in a cloak made of 
 D:shark skin. 
 
@@ -15607,9 +20436,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRUSH:HURT:1d20
 B:CRUSH:HURT:1d20
-F:RAND_25 | FORCE_MAXHP | RES_WATE | 
-F:ANIMAL | AQUATIC | WILD_TOO |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:Although it looks like a fish and lives in water, it is in fact 
 D:a mammal. And it is huge! 
 
@@ -15621,9 +20454,15 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:POISON:3d6
 B:BITE:POISON:3d6
-F:AQUATIC | ANIMAL | IM_POIS | FRIENDS | 
-F:CHAR_CLEAR | ATTR_CLEAR | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
 S:MULTIPLY
 D:A relative of crabs and shrimp, this is a tiny creature that inhabits sandy 
 D:bottoms. It has a pair of dangerous-looking claws. 
@@ -15638,8 +20477,14 @@ B:SPIT:BLIND:1d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
-F:RAND_25 | IM_COLD | RES_WATE | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:It doesn't move very fast, but when it does - watch out! 
 
 N:892:Giant octopus
@@ -15652,11 +20497,23 @@ B:SPIT:BLIND:1d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:PARALYZE:8d4
-F:AQUATIC | SMART | IM_POIS | ANIMAL | NO_CONF | NO_SLEEP | 
-F:NO_FEAR  | SMART  | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_15 |
-S:DARKNESS | SLOW | CONF | SCARE
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:SMART
+F:SMART
+F:WEIRD_MIND
+S:1_IN_15
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:A cunning and dangerous undersea opponent. 
 
 N:893:Eye of the deep
@@ -15669,12 +20526,30 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | AQUATIC | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | RES_TELE | 
-F:SMART | DROP_CORPSE | BASEANGBAND
-S:1_IN_2 |
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_WATE | BO_ICEE | BO_MANA | BO_COLD
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A beholder that inhabits the depths of the sea, sleeping and pondering 
 D:alien thoughts for centuries. Occasionally, it will float to the 
 D:surface to wreck the lives of surface dwellers. 
@@ -15689,12 +20564,27 @@ B:BITE:POISON:5d10
 B:CLAW:PARALYZE
 B:STING:INSANITY:5d10
 B:STING:UN_BONUS
-F:AQUATIC | ANIMAL | WEIRD_MIND | FORCE_MAXHP | HURT_LITE |
-F:EVIL | SMART   | NO_CONF | NO_SLEEP | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BA_POIS | BR_DARK | BLIND | BR_POIS | SLOW | CONF | MIND_BLAST |
-S:BRAIN_SMASH | DARKNESS
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:SMART
+F:WEIRD_MIND
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:BRAIN_SMASH
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:MIND_BLAST
+S:SLOW
 D:A gigantic aquatic monster, somewhat resembling a cross between a 
 D:lobster and a spider. It is coated in poisonous slime and noxious 
 D:parasites. This foul creature hides in the silt of the deep ocean floor, 
@@ -15709,10 +20599,22 @@ O:0:0:0:0
 B:TOUCH:BLIND:3d3
 B:TOUCH:POISON:2d4
 B:WAIL:TERRIFY
-F:COLD_BLOOD | EMPTY_MIND | EVIL | AQUATIC | UNDEAD | IM_COLD | INVISIBLE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_8
-S:BLIND | HOLD | CONF
+S:BLIND
+S:CONF
+S:HOLD
 D:A ghastly victim of drowning, forever doomed to wander the ocean waters 
 D:looking for revenge. 
 
@@ -15723,8 +20625,12 @@ W:12:1:3000:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:4d4
-F:RAND_25 | AQUATIC | ANIMAL | STUPID | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:STUPID
 D:A small species of shark, although the teeth are still as deadly. 
 
 N:897:Hammerhead shark
@@ -15736,8 +20642,11 @@ O:0:0:0:0
 B:BITE:HURT:3d4
 B:BUTT:HURT:3d4
 B:BITE:HURT:3d4
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A hungry shark with a strange head. 
 
 N:898:Great white shark
@@ -15749,8 +20658,11 @@ O:0:0:0:0
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
-F:FORCE_SLEEP | AQUATIC | COLD_BLOOD | 
-F:ANIMAL MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_SLEEP
+F:MORTAL
 D:A very large carnivorous fish. 
 
 N:899:Aquatic golem
@@ -15761,9 +20673,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:3d10
 B:HIT:HURT:3d10
-F:COLD_BLOOD | EMPTY_MIND | AQUATIC | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:An ingenious gnomish invention -- a golem designed for underwater 
 D:usage. 
 
@@ -15774,8 +20694,12 @@ W:5:1:1500:35
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d10
-F:DROP_90 | EVIL | IM_POIS | AQUATIC  | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:AQUATIC
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
 D:Yes, your favourite denizen of evil also comes in an aquatic variety. 
 
 N:901:White shark
@@ -15787,8 +20711,11 @@ O:0:0:0:0
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fast-moving hunter of the depths. When this creature moves, 
 D:everybody in the water is in danger! 
 
@@ -15802,68 +20729,24 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:3d2
 B:HIT:HURT:3d2
-F:MALE | 
-F:FORCE_MAXHP | AQUATIC | REGENERATE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_OCEAN |
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_WATE
+F:TROLL
+F:WILD_OCEAN
+F:WILD_TOO
 D:A troll of the sea, he reeks of brine. 
 
-N:903:Jaws
-G:~:w
-I:130:100d20:200:80:70
-W:40:2:7000:2000
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:BITE:HURT:11d2
-B:BITE:HURT:22d1
-B:BITE:HURT:11d2
-B:BITE:HURT:22d1
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:NO_CONF | NO_SLEEP | 
-F:MORTAL | ZANGBAND
-D:The biggest white shark who has ever lived, it is hunting for you now! 
-
-N:904:Aquatic elf
-G:h:b
-I:110:14d8:30:30:6
-W:9:1:1400:25
-E:1:1:1:2:1:0
-O:20:20:50:10
-B:HIT:HURT:3d4
-F:MALE | AQUATIC | SMART | DROP_CORPSE |
-F:FRIENDS | DROP_60 | ZANGBAND | HAS_LITE
-D:A sleek form vaguely shaped like a dolphin, except with a humanoid 
-D:head and arms. The facial features are decidedly elven. 
-
-N:905:Aquatic elven warrior
-G:h:b
-I:110:20d8:40:35:5
-W:10:1:1500:35
-E:1:1:1:2:1:0
-O:20:60:10:10
-B:HIT:HURT:4d4
-B:HIT:HURT:4d4
-F:MALE | AQUATIC | FRIENDS | SMART | DROP_60 | DROP_CORPSE | ZANGBAND |
-F:HAS_LITE
-D:An aquatic elf trained in all forms of combat. 
-
-N:906:Aquatic elven shaman
-G:h:b
-I:110:12d8:30:30:6
-W:10:1:1400:35
-E:1:1:1:2:1:0
-O:10:10:70:10
-B:TOUCH:UN_BONUS
-F:MALE | AQUATIC | SMART | DROP_2D2 | DROP_CORPSE | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_12 |
-S:BO_MANA | BO_COLD | S_MONSTERS
-D:A wizened aquatic elf skilled in the magical arts. You can see an 
-D:iridescent film coating the water around him. 
-
 N:907:Stargazer
 G:~:y
 I:100:15d9:10:25:30
@@ -15871,9 +20754,13 @@ W:21:1:800:60
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:AQUATIC | ANIMAL | SMART  | RAND_25 | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:SMART
+S:1_IN_10
 S:S_MONSTER
 D:A giant fish shaped like a flounder. There are two enormous eyes 
 D:occupying half of the creature's body. 
@@ -15886,9 +20773,12 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:CONFUSE
-F:AQUATIC | ANIMAL | SMART | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:SMART
+S:1_IN_10
 S:S_MONSTERS
 D:A stargazer a bit larger than average, covered with barnacles. 
 
@@ -15899,8 +20789,13 @@ W:13:1:700:55
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d6
-F:AQUATIC | ANIMAL | RAND_25 | INVISIBLE | ATTR_CLEAR | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:DROP_CORPSE
+F:INVISIBLE
+F:MORTAL
+F:RAND_25
 D:A flattened fish which is able to change body colouring for 
 D:camouflage. 
 
@@ -15912,8 +20807,10 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d2
 B:BITE:HURT:2d2
-F:ANIMAL | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
 D:A giant turtle with flippers, adapted for life in the ocean. 
 
 N:911:Baby dragon turtle
@@ -15925,10 +20822,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:ONLY_GOLD
+S:1_IN_12
 S:BR_SOUN
 D:A newly-hatched dragon turtle. It still hasn't grown a proper shell. 
 
@@ -15941,12 +20845,17 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_3D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_11 | 
-S:SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+S:1_IN_11
 S:BR_SOUN
+S:SCARE
 D:A dragon-like creature inhabiting lightless reaches of ocean caves. It has 
 D:a long neck with a tiny head, and four massive flippers. It has a soft and 
 D:flexible shell. 
@@ -15960,13 +20869,20 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_4D2 | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | AQUATIC | BASEANGBAND | HAS_LITE
+F:AQUATIC
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_9
 S:BR_SOUN
+S:SCARE
 D:A large dragon turtle, covered with a tough white shell. 
 
 N:914:Ancient dragon turtle
@@ -15978,13 +20894,26 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_1D2 | DROP_4D2 |
-F:SMART | AQUATIC | POWERFUL | MOVE_BODY  |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:BLIND | CONF | SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_9
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge dragon turtle. You can see many barnacles covering its body. 
 
 N:915:Fastitocalon
@@ -15997,11 +20926,26 @@ B:BITE:HURT:5d8
 B:BITE:HURT:5d8
 B:CRUSH:POISON:3d10
 B:CRUSH:POISON:3d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_FIRE | BR_ACID | BR_SOUN | BA_WATE
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
+S:BR_ACID
+S:BR_FIRE
+S:BR_SOUN
 D:A huge aquatic dragon-turtle, its shell is as large as a small island. 
 
 N:916:Undead stargazer
@@ -16012,9 +20956,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:EXP_20
-F:AQUATIC | ANIMAL | SMART | INVISIBLE | UNDEAD | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:S_UNDEAD | S_MONSTER
+F:ANIMAL
+F:AQUATIC
+F:INVISIBLE
+F:NO_CUT
+F:SMART
+F:UNDEAD
+S:1_IN_10
+S:S_MONSTER
+S:S_UNDEAD
 D:A stargazer brought back from the dead under control of some unholy 
 D:sorceror. 
 
@@ -16026,8 +20976,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:7d4
 B:BITE:HURT:7d4
-F:AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:MORTAL
+F:WILD_OCEAN
+F:WILD_TOO
 D:An almost beautiful, deadly beast. 
 
 N:918:Merrow
@@ -16038,10 +20991,21 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | IM_COLD | IM_POIS | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:A great ogre of the sea, it is violent and stupid. 
 
 N:919:Water naga
@@ -16054,41 +21018,24 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:POISON:1d8
 B:BITE:POISON:1d8
-F:FEMALE |
-F:AQUATIC | DROP_CORPSE |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:EVIL | NO_CONF | NO_SLEEP | SMART | 
-F:MORTAL | BASEANGBAND
-S:1_IN_7 | 
-S:DARKNESS | CAUSE_3 | BO_ICEE
+F:AQUATIC
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+S:1_IN_7
+S:BO_ICEE
+S:CAUSE_3
+S:DARKNESS
 D:A naga adapted to underwater life. She has a fish-like tail and a pair 
 D:of gills. 
 
-N:920:Devilfish
-G:~:s
-I:105:10d5:10:10:5
-W:12:1:900:60
-E:0:0:0:0:1:0
-O:0:0:0:0
-F:NEVER_BLOW | ATTR_MULTI | AQUATIC | NO_CONF | DROP_CORPSE |
-F:MORTAL | ZANGBAND
-S:1_IN_4 |
-S:BR_CHAO | BR_LITE | BR_SOUN | BR_DISE | BR_TIME
-D:A disgusting fish, it has a large gaping mouth and a small lantern dangling 
-D:from an outgrowth on its head. 
-
-N:921:Undead devilfish
-G:~:D
-I:105:10d5:10:10:5
-W:15:1:0:75
-E:0:0:0:0:1:0
-O:0:0:0:0
-F:NEVER_BLOW | ATTR_MULTI | AQUATIC | INVISIBLE | NO_CONF | UNDEAD |
-F:ZANGBAND | NO_CUT
-S:1_IN_4 |
-S:BR_NETH | BR_DISE | BR_TIME | BR_NEXU | BR_POIS 
-D:A devilfish brought back from the dead. 
-
 N:922:Moby Dick, the White Whale
 G:~:w
 I:120:100d25:200:80:70
@@ -16099,11 +21046,22 @@ B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:MORTAL | JOKEANGBAND
-S:1_IN_6 | BA_WATE
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:UNIQUE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
 D:The mightiest whale of the seas, he has sunk many ships in his time. With 
 D:a mere flick of his tail he can create a mighty whirlpool, to the ruin 
 D:of all who would travel the ocean. 
@@ -16117,11 +21075,14 @@ O:0:0:0:0
 B:BITE:CONFUSE:2d8
 B:BITE:HURT:2d8
 B:CLAW:POISON:2d8
-F:FRIENDS | DROP_CORPSE |
-F:ANIMAL | AQUATIC |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
-S:BO_ICEE | BO_WATE
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+S:1_IN_10
+S:BO_ICEE
+S:BO_WATE
 D:A dog with a finned tail and large, muscular flippers for hind legs. 
 D:It has a rubbery skin instead of fur. 
 
@@ -16134,13 +21095,23 @@ O:20:60:20:0
 B:HIT:HURT:3d4
 B:GAZE:POISON:8d12
 B:CLAW:INSANITY:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | SMART  |
-F:ONLY_ITEM | DROP_60 | 
-F:AQUATIC | POWERFUL | 
-F:EVIL | DEMON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BO_ICEE | BA_WATE
+F:AQUATIC
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_8
+S:BA_WATE
+S:BO_ICEE
 D:A hideous scaled demon, it is a sleek form with many fins but no visible 
 D:arms or legs. It has a toothed gaping maw, reminiscent of a caricature 
 D:of a shark's jaws. 
@@ -16153,8 +21124,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:2d5
 B:STING:POISON:2d5
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 D:An intelligent devil-ray of the depths. 
 
 N:926:Ixitxachitl priest
@@ -16165,10 +21141,20 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:2d7
 B:STING:POISON:2d7
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 S:1_IN_6
-S:TELE_TO | HEAL | SCARE | CAUSE_2 | BLIND | S_MONSTER
+S:BLIND
+S:CAUSE_2
+S:HEAL
+S:SCARE
+S:S_MONSTER
+S:TELE_TO
 D:A devil-ray of the depths, with priestly magic. 
 
 N:927:Vampiric ixitxachitl
@@ -16179,10 +21165,20 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:3d8
 B:STING:EXP_40:3d8
-F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | WILD_TOO |
-F:BASEANGBAND | COLD_BLOOD
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:RES_NETH
+F:WILD_TOO
 S:1_IN_6
-S:HEAL | SCARE | CAUSE_3 | BLIND | FORGET | HASTE
+S:BLIND
+S:CAUSE_3
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
 D:A devil-ray of the depths, with vampiric powers. 
 
 N:928:Mathilde, the Science Student
@@ -16191,11 +21187,23 @@ I:110:220d100:40:10:3
 W:0:4:1100:0
 E:0:1:1:2:1:1
 O:20:20:20:20
-F:UNIQUE | FEMALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | RAND_25
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:OPEN_DOOR | DG_CURSE |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:DG_CURSE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:She loves joking, and she's constantly giggling. A very happy girl. 
 D:Beware, it is rumoured that Dark God has put a mighty curse on her. 
 
@@ -16208,9 +21216,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:3d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:930:Young spirit
@@ -16221,9 +21238,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:9d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:931:Mature spirit
@@ -16234,9 +21260,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:18d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:932:Experienced spirit
@@ -16247,9 +21282,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:20d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:933:Wise spirit
@@ -16260,9 +21304,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:30d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:934:Fangorn the Treebeard, Lord of the Ents
@@ -16275,10 +21328,24 @@ B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | DROP_CORPSE |
-F:SMART | TAKE_ITEM | BASH_DOOR | KILL_WALL | NO_SLEEP |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:The first being to awoke on Arda, apart from the Valar themselves.  He is the 
 D:first, oldest, greatest and most respected of all the Ents:  and though he is 
 D:slow to anger, he is a terrible foe when roused. 
@@ -16293,17 +21360,49 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:TERRIFY:5d5
 B:HIT:TERRIFY:5d5
-F:UNIQUE | MALE | CAN_SPEAK | PET | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:GOOD | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | BRAIN_SMASH | FORGET | TRAPS | 
-S:BA_FIRE | BO_FIRE | BO_PLAS | BO_MANA | CAUSE_4 |
-S:S_MONSTERS | S_ANGEL | S_DRAGON | S_KIN 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANGEL
+S:S_DRAGON
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 D:The wizard who opposed Sauron and, in the end, was the only 
 D:one of the Istari to succeed in his task. Gandalf is very 
 D:wise and specialises in fire magic. 
@@ -16318,13 +21417,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE |
-F:FORCE_MAXHP | FORCE_SLEEP |
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_POIS |
-F:DROP_CORPSE | DROP_SKELETON | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | MIND_BLAST 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_6
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:HEAL
+S:MIND_BLAST
 D:The friend and companion of the dwarven king Thror, he went mad with 
 D:grief after Thror's death at the hands of Azog the Orc.  With torn beard 
 D:and ragged clothes, he seems to have fixed on you as a convenient target 
@@ -16337,10 +21447,21 @@ W:8:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO | FRIENDS | 
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_12 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter.
 
 N:938:Great Swamp Wyrm
@@ -16353,14 +21474,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:POISON:6d14
 B:BITE:POISON:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A truly enormous dragon with great powers.  The foul gases issuing 
 D:from the beast nearly make you vomit; and while you may try to hold 
 D:your breath as you fight it, it sees no reason to do likewise. 
@@ -16375,14 +21512,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ACID:6d14
 B:BITE:ACID:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge and very powerful dragon.  Great steaming pools of acid drip from 
 D:its form onto the ground.  You shudder when you see the acid eating away 
 D:the very stones of the dungeon - what could it do to you?
@@ -16395,11 +21548,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL |  HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power.
 
@@ -16411,11 +21575,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:4d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16427,11 +21602,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:5d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16443,11 +21629,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16459,11 +21656,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:8d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16475,11 +21683,22 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
-F:MALE | FRIENDS | OPEN_DOOR | BASH_DOOR |
-F:GOOD | DROP_SKELETON | DROP_CORPSE | SMART | PET |
-F:IM_ACID | IM_COLD | RES_WATE | RES_NETH |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
+S:1_IN_2
 S:ARROW_4
 D:An elf cloaked in green wielding a longbow. 
 
@@ -16493,12 +21712,27 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:EXP_80:4d6
 B:HIT:EXP_80:4d6
-F:UNIQUE | MALE |
-F:FORCE_MAXHP |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NAZGUL |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CHOSEN |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | SPECIAL_GENE | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
 D:A tall black Ringwraith, he is a master of horsemanship. He longs 
 D:to taste your blood. 
 
@@ -16512,15 +21746,37 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:TOUCH:EXP_80:5d6
 B:TOUCH:EXP_80:5d6
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | FORGET |
-S:BO_ACID | BO_FIRE | BO_COLD | BO_NETH |
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:A sorceress in life, Adunaphel quickly fell under Sauron's sway and the 
 D:power of the rings. 
@@ -16535,15 +21791,37 @@ B:HIT:HURT:7d6
 B:HIT:HURT:7d6
 B:GAZE:EXP_80:6d6
 B:WAIL:TERRIFY:6d6
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS |
-S:BO_FIRE | BO_COLD | BO_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 S:S_MONSTERS
 D:A mighty sorcerer king, Akhorahil was blind in life. With powerful 
 D:enchantments, he created jewelled eyes that enabled him to see better than 
@@ -16559,14 +21837,37 @@ B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_FIRE | BO_NETH | BA_FIRE |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:Ren was an insane eastern king who believed himself to be the son of a 
 D:volcano god. At an early age his sanity was destroyed by a plague that 
@@ -16582,15 +21883,39 @@ B:HIT:HURT:8d7
 B:HIT:HURT:8d7
 B:TOUCH:EXP_40:6d7
 B:TOUCH:EXP_40:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BA_FIRE | BA_NETH | BA_COLD | BA_ELEC | BA_ACID | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_UNDEAD
 D:This Ringwraith was a weak-minded sorcerer-king who fell easily under 
 D:Sauron's power. 
@@ -16605,15 +21930,39 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:BITE:EXP_40:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BA_FIRE | BA_NETH |
-S:S_MONSTERS | S_UNDEAD | S_HOUND
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
+S:S_UNDEAD
 D:Dwar had a special affinity for dogs in life, and can still command them 
 D:at will. He howls manically as he reaches out to destroy you. 
 
@@ -16627,15 +21976,39 @@ B:HIT:HURT:9d9
 B:HIT:HURT:9d9
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NAZGUL | DROP_CHOSEN |
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | MIND_BLAST | 
-S:BO_COLD | BA_COLD | BA_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 S:S_UNDEAD
 D:A Ringwraith powerful in fell sorcery, he yearns for the life he has 
 D:exchanged for an unlife of everlasting torment. 
@@ -16650,16 +22023,46 @@ B:HIT:HURT:9d10
 B:HIT:HURT:9d10
 B:TOUCH:EXP_80:7d7
 B:TOUCH:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_LEVEL | BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | BO_MANA | 
-S:BA_FIRE | BA_COLD | BA_NETH | ANIM_DEAD | 
-S:S_HI_UNDEAD | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
+S:TELE_LEVEL
 D:He was the warrior-king of the East, now a Ringwraith. Khamul is a powerful opponent, his skill in 
 D:combat awesome and his form twisted by evil cunning. 
 
@@ -16673,16 +22076,45 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:EXP_80:7d7
 B:HIT:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | NAZGUL |
-F:EVIL | UNDEAD | DROP_CHOSEN |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_AWAY | BLIND | HOLD | SCARE | CAUSE_3 | BRAIN_SMASH | 
-S:BO_MANA | BA_NETH | S_WRAITH | 
-S:S_KIN | S_HI_UNDEAD | S_HI_DRAGON | S_MONSTERS | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_WRAITH
+S:TELE_AWAY
 D:The Chief of the Ringwraiths. A fell being of devastating power, his 
 D:spells are lethal and his combat blows crushingly hard. He moves at 
 D:speed, and commands legions of evil to do his bidding. It is said that he 
@@ -16696,14 +22128,26 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:FEMALE |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:BLINK | TELE_AWAY
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TELE_AWAY
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:956:Blue Thunderlord
@@ -16714,14 +22158,27 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d7
 B:HIT:HURT:8d7
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:957:Brown Thunderlord
@@ -16732,14 +22189,27 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d9
 B:HIT:HURT:8d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY |  HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Beware its flame. 
 
 N:958:Bronze Thunderlord
@@ -16750,14 +22220,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
+S:TPORT
 D:A Thunderlord, mightiest among the males. 
 
 N:959:Gold Thunderlord
@@ -16770,15 +22254,31 @@ B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:FEMALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME | 
-S:TPORT | BLINK | TELE_TO | TELE_AWAY |
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
 S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:A Thunderlord, among the queens of their kind. 
 
 N:960:Blood Sprout
@@ -16791,10 +22291,17 @@ B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
-F:STUPID | EMPTY_MIND | KILL_TREES | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_TREES
 F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:A kind of giant mycorrhiza, corrupted into a carnivore by Morgoth.
 
@@ -16808,14 +22315,29 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE
-S:1_IN_2 | 
-S:CAUSE_3 | BO_WATE | BO_MANA
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BO_MANA
+S:BO_WATE
+S:CAUSE_3
 D:This sad creature - once a mighty warrior - betrayed his former friends to 
 D:Morgoth's army in return for, he thought, safety for himself and his wife.  
 D:And so he fell under Morgoth's power and became little more than a mindless 
@@ -16831,10 +22353,22 @@ B:CLAW:HURT:2d5
 B:TOUCH:EAT_ITEM
 B:TOUCH:INSANITY:2d5
 B:TOUCH:INSANITY:2d5
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOO | 
-F:RAND_25 | UNIQUE | STUPID | MALE | FORCE_MAXHP |
-F:TAKE_ITEM | CAN_SPEAK | CAN_SWIM | EVIL |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:STUPID
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 S:1_IN_8
 S:SHRIEK
 D:He tends to blubber a lot, he was a simple blubbering idiot before he lost 
@@ -16851,11 +22385,22 @@ B:CLAW:POISON:2d8
 B:CLAW:POISON:2d8
 B:BITE:POISON:2d6
 B:BITE:POISON:2d6
-F:DROP_SKELETON | FORCE_MAXHP | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIDER
 S:1_IN_4
-S:BO_FIRE | SLOW | HOLD | CAUSE_3 | MISSILE
+S:BO_FIRE
+S:CAUSE_3
+S:HOLD
+S:MISSILE
+S:SLOW
 D:A red arachnid with legs weaving spells in the air. 
 
 N:964:Elder aranea
@@ -16868,12 +22413,27 @@ B:CLAW:POISON:5d8
 B:CLAW:POISON:5d8
 B:BITE:HALLU:5d6
 B:BITE:HALLU:5d6
-F:DROP_SKELETON | FORCE_MAXHP |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE | SMART |
-F:ANIMAL | SPIDER | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIDER
 S:1_IN_6
-S:SLOW | HOLD | DRAIN_MANA | MIND_BLAST | HEAL | 
-S:BA_FIRE | BO_FIRE | CAUSE_3 | S_SPIDER
+S:BA_FIRE
+S:BO_FIRE
+S:CAUSE_3
+S:DRAIN_MANA
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_SPIDER
 D:A vast, bloated arachnid, master of its brood: among the more terrible of 
 D:Ungoliant's descendants, this is a monster such as those who haunted the dread 
 D:valley of Nan Dungortheb long ago. 
@@ -16886,8 +22446,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
 B:STING:BLIND:1d1
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
 N:966:Wavelord
@@ -16900,13 +22464,34 @@ B:HIT:HURT:8d9
 B:HIT:COLD:8d9
 B:HIT:HURT:8d9
 B:HIT:COLD:8d9
-F:SMART | PET | DROP_CORPSE | FRIENDS | WILD_SHORE | WILD_OCEAN | WILD_TOO | 
-F:IM_POIS | AQUATIC | CAN_SWIM | DROP_USEFUL |
-F:NO_CONF | NO_SLEEP | NO_FEAR | DROP_GOOD | DROP_3D2 |
-F:MORTAL | REGENERATE | TAKE_ITEM | GOOD | SUSCEP_FIRE |
-F:RES_WATE | RES_NEXU | HAS_LITE
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_USEFUL
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:PET
+F:REGENERATE
+F:RES_NEXU
+F:RES_WATE
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_4
-S:BO_WATE | BA_WATE | BO_ICEE
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:The Dolphiners came with the Thunderlords from their far home. 
 D:These friendly beings ride their sharks into combat to assist you. 
 
@@ -16916,8 +22501,9 @@ I:110:1d1:30:1:10
 W:10:3:10:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 D:It does not look that powerful. 
 
 N:968:Bat of Gorgoroth
@@ -16928,11 +22514,23 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:POISON:1d10
 B:CLAW:HURT:1d4
-F:DROP_60 | RAND_25 | MOVE_BODY | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | MOVE_BODY | FRIENDS | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | AI_ANNOY | MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:SCARE | BR_POIS | BR_DARK
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:MOVE_BODY
+F:RAND_25
+F:WEIRD_MIND
+S:1_IN_8
+S:BR_DARK
+S:BR_POIS
+S:SCARE
 D:Fed with horrid meats and grown to enormous size, this slavering creature 
 D:seeks livelier prey. 
 
@@ -16942,10 +22540,19 @@ I:110:1d1:40:250:3
 W:0:4:730:0
 E:0:1:1:2:1:1
 O:0:0:1:0
-F:FEMALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE | NO_TARGET
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_DEATH | RES_TELE
-F:MORTAL | BASEANGBAND | UNIQUE | PET | 
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:RES_TELE
+F:SPECIAL_GENE
+F:UNIQUE
 D:The princess of an unknown kingdom, you need to save her! 
 
 N:970:Merton Proudfoot, the lost hobbit
@@ -16954,10 +22561,18 @@ I:110:1d1:40:250:3
 W:1:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | PET | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:SPECIAL_GENE
+F:UNIQUE
 D:The poor hobbit got lost in the dreadful maze! 
 
 N:971:The Wight-King of the Barrow-downs
@@ -16970,12 +22585,29 @@ B:HIT:HURT:2d10
 B:WAIL:PARALYZE:2d6
 B:TOUCH:EXP_80:4d8
 B:TOUCH:EXP_80:4d8
-F:SPECIAL_GENE | FORCE_MAXHP | SMART | CAN_SPEAK | 
-F:DROP_4D2 | DROP_2D2 | COLD_BLOOD | UNIQUE | 
-F:CAN_SWIM | CAN_FLY | EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 |
-S:HOLD | SCARE | CAUSE_3 | BA_NETH
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:He has lived in the Barrow-Downs for centuries after his first death at the 
 D:hands of the Witch-King of Angmar.  A once loyal captain under the 
 D:Witch-King's command, he now awaits a time when his undead forces shall 
@@ -16989,9 +22621,13 @@ O:50:50:0:0
 B:HIT:HURT:2d6
 B:PUNCH:HURT:1d7
 B:KICK:HURT:1d8
-F:SPECIAL_GENE | SMART | OPEN_DOOR
-F:FORCE_MAXHP | CAN_SWIM | BASEANGBAND | 
-F:NO_SLEEP | NO_CONF
+F:CAN_SWIM
+F:FORCE_MAXHP
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
 D:A great warrior. 
 
 N:973:Experienced possessor (soul)
@@ -16999,8 +22635,9 @@ G:G:D
 I:120:5d5:30:50:10
 W:30:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_9
 S:S_KIN
 D:It does not look that powerful. 
@@ -17010,30 +22647,13 @@ G:G:D
 I:130:10d10:30:100:10
 W:95:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_4
 S:S_KIN
 D:It does not look that powerful. 
 
-N:975:Death orb
-G:E:D
-I:130:40d100:255:75:0
-W:80:5:10:5000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:PARASITE:20d10
-B:ENGULF:ACID:6d5
-B:ENGULF:EXP_80:6d5
-B:ENGULF:LOSE_ALL:6d5
-F:FORCE_MAXHP | ZANGBAND | KILL_ITEM | KILL_WALL | KILL_BODY | 
-F:NONLIVING | COLD_BLOOD | EMPTY_MIND | CAN_SWIM | 
-F:NO_CONF | NO_SLEEP | NO_STUN | REGENERATE | 
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:RES_NETH | RES_PLAS | RES_WATE | RES_DISE | RES_NEXU | 
-F:DEATH_ORB | NO_CUT
-D:A small, apparently unassuming orb which spawns death and destruction. 
-
 N:976:Bronze dragon worm
 G:w:U
 I:100:10d15:10:40:80
@@ -17043,13 +22663,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_CONF
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_CONF
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales glitter in 
 D:a multitude of perplexing and distracting ways. 
@@ -17063,13 +22691,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_SOUN
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_SOUN
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can feel the air itself 
 D:vibrating as you near it. 
@@ -17080,11 +22716,20 @@ I:100:1d1:1:1:0
 W:1:1:20:3
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:NEVER_MOVE | UNIQUE |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | FORCE_DEPTH |
-F:NO_CONF | NO_SLEEP | NO_FEAR |
-F:MORTAL | WYRM_PROTECT | ONLY_DEPTH | JOKEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:FORCE_DEPTH
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_DEPTH
+F:STUPID
+F:UNIQUE
+F:WYRM_PROTECT
 D:A small strange growth. It seems to be defenceless... 
 
 N:979:The Physics Teacher
@@ -17097,15 +22742,35 @@ B:TOUCH:LOSE_INT:13d13
 B:TOUCH:LOSE_WIS:13d13
 B:GAZE:PARALYZE
 B:WAIL:EXP_80
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | DROP_CORPSE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:PASS_WALL | MOVE_BODY | AURA_FIRE |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | ANIMAL | DEMON | UNDEAD | JOKEANGBAND | NO_CUT
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DEMON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:SMART
+F:UNDEAD
+F:UNIQUE
 S:1_IN_3
-S:BR_FIRE | BR_PLAS | BR_TIME | BA_WATE | ROCKET | 
+S:BA_WATE
+S:BR_FIRE
+S:BR_PLAS
+S:BR_TIME
 S:FORGET
+S:ROCKET
 D:A keeper of forbidden wisdom, this Teacher bombards you with his mastery 
 D:over elements of matter. 
 
@@ -17119,12 +22784,30 @@ B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | BASEANGBAND | 
-F:HAS_LITE | AQUATIC
-S:1_IN_6 |
-S:HEAL | HASTE | TELE_AWAY | S_MONSTERS | S_KIN
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:HASTE
+S:HEAL
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
 D:Last and proudest king of ancient Numenor. Corrupted by power and 
 D:avarice, he fell victim to Sauron's wiles, tried to fight the immortals 
 D:themselves, and condemned Numenor to oblivion. 
@@ -17134,7 +22817,10 @@ G:@:w
 I:1:1d1:1:1:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:NEVER_MOVE | NEVER_BLOW | DOPPLEGANGER | BASEANGBAND | HAS_LITE
+F:DOPPLEGANGER
+F:HAS_LITE
+F:NEVER_BLOW
+F:NEVER_MOVE
 D:It looks like you... 
 
 N:982:Marylene, Heartbreakeress of the Netherworld
@@ -17147,21 +22833,79 @@ B:GAZE:PARALYZE:20d15
 B:HIT:EXP_80:20d17
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:INSANITY:12d9
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | FEMALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE |
-F:REGENERATE | CAN_FLY | CAN_SWIM | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | DEMON |
-F:MORTAL | DG_CURSE | JOKEANGBAND | HAS_LITE
-S:1_IN_1 | 
-S:BR_CHAO | BA_CHAO | BRAIN_SMASH | SHRIEK | BR_CONF | BR_SOUN |
-S:BR_NETH | HASTE | TRAPS | FORGET | BR_DISE | BR_TIME | MIND_BLAST |
-S:HEAL | TPORT | TELE_TO | CAUSE_1 | CAUSE_2 | CAUSE_3 | CAUSE_4 | BLIND |
-S:CONF | SLOW | HOLD | S_ANGEL | S_UNIQUE
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEMON
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_1
+S:BA_CHAO
+S:BLIND
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_CONF
+S:BR_DISE
+S:BR_NETH
+S:BR_SOUN
+S:BR_TIME
+S:CAUSE_1
+S:CAUSE_2
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:SLOW
+S:S_ANGEL
+S:S_UNIQUE
+S:TELE_TO
+S:TPORT
 D:A woman of mind-shattering beauty, none can match her beauty. She is perfect, 
 D:and totally evil. She loves nothing but herself and her evil is as 
 D:great as her beauty. No one can stand against her, even DarkGod. 
@@ -17179,41 +22923,58 @@ B:GAZE:PARALYZE:20d15
 B:HIT:HURT:15d10
 B:TOUCH:EXP_80:10d5
 B:TOUCH:EAT_ITEM
-F:RAND_50 | TAKE_ITEM | FORCE_MAXHP | UNIQUE |
-F:DROP_3D2 | DROP_GOOD | DROP_GREAT | WYRM_PROTECT | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | DEMON |
-F:EVIL | WEIRD_MIND | RES_NETH | INVISIBLE | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | JOKEANGBAND | NO_CUT
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RAND_50
+F:RES_NETH
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
 S:1_IN_2
-S:CONF | SHRIEK | BR_CONF | BR_TIME | BR_INER | BR_GRAV | BRAIN_SMASH |
-S:SCARE | BLIND | SLOW | HOLD | HASTE | HEAL | TELE_TO | FORGET |
-S:S_HI_DEMON | S_MONSTERS | S_HYDRA | S_HI_DRAGON | S_HI_UNDEAD | S_ANGEL |
-S:S_HOUND | S_UNIQUE |
+S:BLIND
+S:BRAIN_SMASH
+S:BR_CONF
+S:BR_GRAV
+S:BR_INER
+S:BR_TIME
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:HOLD
+S:SCARE
+S:SHRIEK
+S:SLOW
+S:S_ANGEL
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_HOUND
+S:S_HYDRA
+S:S_MONSTERS
+S:S_UNIQUE
+S:TELE_TO
 D:It is even worse than the RNG, coming from Mangband, 
 D:it seeks to crush you to pulp... and surely can. 
 
-N:984:Hrungnir, the Stone Giant
-G:P:W
-I:130:99d110:50:160:20
-W:78:2:0:45000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:SHATTER:9d11
-B:HIT:SHATTER:9d11
-B:HIT:HURT:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_ACID | HURT_ROCK | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | IM_POIS | GIANT | 
-F:ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BR_WALL | BR_GRAV | BR_SHAR | BLIND | TELE_TO | S_KIN | S_MONSTERS | 
-S:HAND_DOOM | TELE_AWAY | 
-D:Hrungnir is the strongest of all the Stone Giants: one who would even dare 
-D:to challenge Thor himself to single combat. 
-
 N:985:Bullroarer the Hobbit
 G:h:U
 I:120:6d10:16:8:10
@@ -17222,11 +22983,19 @@ E:1:1:1:2:1:1
 O:25:55:0:20
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:He is a sturdy hobbit who is renowned for his unusual strength and 
 D:vigour. He can prove a troublesome opponent. 
 
@@ -17239,11 +23008,20 @@ O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | CAN_SWIM | 
-F:DROP_CORPSE | DROP_SKELETON | ONLY_GOLD | DROP_2D2 | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_9 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_9
 S:SCARE
 D:A strange reptilian creature with three heads, guarding its hoard. 
 
@@ -17257,12 +23035,23 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
 D:An evil and cunning man from the East.  Having once sworn allegiance to the 
 D:sons of Feanor, it was Uldor's treachery that turned the tide of the Battle 
 D:of Unnumbered Tears in Morgoth's favour. 
@@ -17277,15 +23066,26 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:HEAL
+S:S_ANIMAL
+S:S_SPIDER
 D:An adept at unarmed combat, the mystic strikes with stunning power. He 
 D:can summon help from nature and is able to focus his power to ease any 
 D:pain. 
@@ -17300,14 +23100,36 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:BITE:EXP_80:5d6
 B:BITE:EXP_80:5d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
 D:A terrible robed undead figure, this creature has existed in its 
 D:unlife for many centuries by stealing the life of others. It can 
 D:summon the very shades of its victims from beyond the grave to 
@@ -17323,12 +23145,29 @@ B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | IM_FIRE | IM_COLD | IM_ELEC | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN | S_MONSTERS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
+S:S_MONSTERS
 D:A short and swarthy Easterling dressed in black.  He and his three sons 
 D:once openly swore allegiance to the High Elves, but were secretly in the 
 D:pay of Morgoth. 
@@ -17342,15 +23181,26 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON
-F:RES_NETH | RES_NEXU | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | HOLD | 
-S:S_DEMON | BO_FIRE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+S:1_IN_2
+S:BO_FIRE
+S:HOLD
+S:S_DEMON
+S:TPORT
 D:A figure twisted by evil standing in robes of deepest crimson. 
 
 N:992:Hezrou
@@ -17361,13 +23211,22 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS
-F:ONLY_ITEM | DROP_2D2 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BO_FIRE
 S:S_DEMON
 D:It is a demon of lizard form with cruel-looking jaws. 
 
@@ -17379,13 +23238,21 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BO_FIRE
 S:S_DEMON
 D:It is a demon with arms and pincers, its form a true mockery of life. 
 
@@ -17398,15 +23265,24 @@ O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE
-F:ONLY_ITEM | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | 
-S:BR_FIRE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:BR_FIRE
+S:CONF
 S:S_DEMON
 D:It is a large demon with the head of a giant boar. Flames run up and down 
 D:its length. 
@@ -17421,14 +23297,24 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CAUSE_2 | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:CAUSE_2
 S:S_DEMON
 D:She is a demon of female form with many arms, each bearing deadly weapons. 
 
@@ -17442,14 +23328,29 @@ B:HIT:FIRE:4d12
 B:HIT:FIRE:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | 
-S:BR_FIRE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:CONF
 S:S_DEMON
 D:It is a massive humanoid demon wreathed in flames. 
 
@@ -17463,16 +23364,30 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMALS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_3
+S:HEAL
+S:S_ANIMALS
+S:S_SPIDER
 D:A lord of all that is natural, skilled in the mystic ways. He is a master 
 D:of martial arts and is at one with nature, able to summon help from the 
 D:wild if need be.
@@ -17487,15 +23402,31 @@ B:KICK:HURT:20d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | MIND_BLAST | 
-S:S_SPIDER | S_HOUND | S_ANIMALS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:HEAL
+S:MIND_BLAST
+S:S_ANIMALS
+S:S_HOUND
+S:S_SPIDER
 D:He is one of the few true masters of the art, being extremely skillful in 
 D:all forms of unarmed combat and controlling the world's natural creatures 
 D:with disdainful ease. 
@@ -17508,15 +23439,24 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:TOUCH:LOSE_STR:1d5
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND
-S:1_IN_7 | 
-S:BLIND | CONF | BO_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_7
+S:BLIND
+S:BO_FIRE
+S:CONF
 D:It is a lesser demon of female form; however, she takes little time to 
 D:show her true colours. 
 
@@ -17527,10 +23467,20 @@ W:4:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO |
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_9 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter.
 
 N:1001:Polyphemus, the Blind Cyclops
@@ -17543,13 +23493,33 @@ B:HIT:HURT:11d10
 B:HIT:SHATTER:11d10
 B:HIT:HURT:11d10
 B:HIT:SHATTER:11d10
-F:UNIQUE | MALE | BASEANGBAND | HAS_LITE | CAN_SWIM | 
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | DROP_CORPSE | 
-F:DROP_2D2 | DROP_3D2 | DROP_GOOD | ONLY_ITEM | KILL_ITEM | 
-F:BASH_DOOR | KILL_BODY | 
-F:EVIL | GIANT | IM_ACID | IM_POIS | IM_FIRE | IM_COLD | 
-S:1_IN_5 | 
-S:BO_WATE | BA_WATE | BO_ICEE | BA_ACID | ARROW_4
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:MALE
+F:ONLY_ITEM
+F:RAND_25
+F:UNIQUE
+S:1_IN_5
+S:ARROW_4
+S:BA_ACID
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:No ordinary cyclops, but the son of a sea-god:  he wields the powers of 
 D:elemental water as well as the considerable strength of a cyclops.  His 
 D:one eye was blinded long ago by the warrior Odysseus, but he has trained 
@@ -17565,36 +23535,34 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:CONFUSE:6d14
 B:BITE:CONFUSE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_4
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A dragon of great size and power.  Its polished bronze scales reflect the 
 D:light in strange and confusing patterns, and you find it hard to keep your 
 D:mind on the job of fighting for your life. 
 
-N:1003:Hound of Tindalos
-G:Z:s
-I:120:60d15:30:100:0
-W:59:3:600:8000
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:TIME:2d12
-B:BITE:TIME:2d12
-B:CLAW:HURT:2d12
-B:CLAW:HURT:2d12
-F:FORCE_SLEEP | FRIENDS | RES_NETH |
-F:INVISIBLE | PASS_WALL | EVIL | CAN_FLY |
-F:ANIMAL | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_5 | BLINK | TELE_TO |  
-S:BR_NETH | BR_TIME
-D:"They are lean and athirst!... All the evil in the universe 
-D:was concentrated in their lean, hungry bodies. Or had they 
-D:bodies? I saw them only for a moment, I cannot be certain." 
-
 N:1004:Great Wyrm of Thunder
 G:D:y
 I:120:50d100:30:150:80
@@ -17605,14 +23573,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:HURT:6d14
 B:BITE:HURT:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A dragon of gigantic proportions, with destructive abilities to match.  The
 D:sheer loudness of its roar leaves you stunned and unable to think clearly 
 D:enough to defend yourself adequately. 
@@ -17624,8 +23608,11 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d2
-F:RAND_25 | CAN_SWIM | ANIMAL | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is about three feet long with large teeth.  As the light of your lamp falls 
 D:on it, it seems to grow stronger.
@@ -17640,9 +23627,15 @@ B:CLAW:HURT:3d2
 B:CLAW:HURT:3d2
 B:BITE:DISEASE:4d2
 B:BITE:DISEASE:4d2
-F:UNIQUE | ESCORT | ESCORTS | FORCE_MAXHP |
-F:BASH_DOOR | ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:UNIQUE
 D:A massive rat. He's the leader of the pack.
 
 N:1007:Vort the Kobold Queen
@@ -17653,14 +23646,28 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | FEMALE | CAN_SPEAK | 
-F:FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_SKELETON | DROP_CORPSE 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | MISSILE | HEAL | CAUSE_1 | CONF
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_6
+S:CAUSE_1
+S:CONF
+S:HEAL
+S:MISSILE
 D:Where Mughash is the strongest of his kind, his consort Vort is the 
 D:wisest: she is her tribe's chief shamaness. 
 
@@ -17671,8 +23678,12 @@ W:14:1:100:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is six inches long. 
 
@@ -17683,13 +23694,31 @@ W:34:5:0:1200
 E:0:0:0:0:0:0
 O:0:0:100:0
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK
-F:FORCE_MAXHP | UNDEAD | NO_CONF | NO_SLEEP | REGENERATE | NO_STUN |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | PASS_WALL | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:TAKE_ITEM
+F:UNDEAD
+F:UNIQUE
 S:1_IN_6
-S:BR_FIRE | HOLD | CONF | SCARE | MIND_BLAST
+S:BR_FIRE
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:He's back from the grave for vengeance on those who 
 D:burnt him. He has no mercy for those in his way. 
 
@@ -17700,41 +23729,39 @@ W:36:2:1500:1200
 E:1:1:1:2:1:1
 O:20:20:20:20
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | RAND_25 |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:JOKEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SHRIEK | SCARE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+S:1_IN_4
+S:SCARE
+S:SHRIEK
+S:TELE_TO
 D:Once a powerful adventurer, this poor fighter has seen a few too many 
 D:software bugs in his time. Any shred of lucidity is long gone, but 
 D:he still remains dangerous. He wanders aimlessly through the dungeon 
 D:randomly striking at foes both real and imagined, all the while screaming 
 D:out at the world that caused his condition. 
 
-N:1011:Glaryssa, Succubus Queen
-G:U:W
-I:120:12d100:90:60:10
-W:41:3:3000:8000
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:CLAW:HURT:5d5
-B:HIT:LOSE_STR:4d4
-B:TOUCH:EXP_80:8d3
-F:UNIQUE | FEMALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | NO_SLEEP | NO_CONF
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | PASS_WALL | MOVE_BODY | NONLIVING |
-F:OPEN_DOOR | BASH_DOOR | IM_POIS | IM_COLD | DEMON | EVIL | 
-F:ZANGBAND
-S:1_IN_3 |
-S:CAUSE_3 | HOLD | BLIND | BO_ACID | S_DEMON |
-S:FORGET | BO_NETH | MIND_BLAST | DARKNESS
-D:Drop dead gorgeous - literally. 
-
 N:1012:Vermicious Knid
 G:j:s
 I:110:90d10:20:55:100
@@ -17744,11 +23771,20 @@ O:40:30:20:10
 B:TOUCH:TERRIFY:4d6
 B:CRAWL:HURT:4d6
 B:ENGULF:HURT:4d6
-F:FRIENDS | EVIL | IM_COLD | SMART |
-F:COLD_BLOOD | NO_FEAR | WEIRD_MIND |
-F:OPEN_DOOR | ONLY_ITEM | DROP_2D2 | HURT_ROCK | 
-F:NONLIVING | 
-F:JOKEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FRIENDS
+F:HURT_ROCK
+F:IM_COLD
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:WEIRD_MIND
 D:An amorphous shape that looks like wet grey clay with two pale eyes. 
 D:It is totally silent as it oozes towards you.  
 
@@ -17762,32 +23798,34 @@ B:HIT:UN_BONUS:8d8
 B:HIT:UN_BONUS:8d8
 B:HIT:LOSE_STR:6d6
 B:HIT:LOSE_STR:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | EMPTY_MIND | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_HI_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A skeletal form, black as night, constructed from the bones of its 
 D:previous victims. 
 
-N:1014:Snake of Yig
-G:J:b
-I:120:48d10:25:80:30
-W:38:4:2000:600
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:BITE:POISON:3d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | FRIENDS | AURA_FIRE |
-F:BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | EVIL | IM_FIRE | IM_POIS | 
-F:MORTAL | ZANGBAND
-S:1_IN_5 | 
-S:BR_POIS
-D:It is a giant snake that drips with poison. 
-
 N:1015:Bronze golem
 G:g:o
 E:2:1:2:4:1:1
@@ -17798,154 +23836,30 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:FORCE_MAXHP | FORCE_SLEEP | EMPTY_MIND | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | IM_FIRE | IM_ELEC | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BO_PLAS | BA_FIRE | BR_FIRE | BA_ELEC | S_HI_DEMON | TELE_TO
-D:A gigantic four-armed animated bronze statue, glowing with great heat. 
-
-N:1016:Dimensional shambler
-G:h:B
-I:120:40d10:30:68:255
-W:29:6:1100:400
-E:0:0:0:0:0:0
-O:20:40:40:0
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | GOOD |
-F:ONLY_ITEM | DROP_2D2 | NONLIVING | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | 
-F:CTHANGBAND
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | CONF | SCARE | TPORT | BLINK
-D:A shabby humanoid with a wrinkled skin. It seems to shift 
-D:in and out of existence as you watch. 
-
-N:1017:Cultist
-G:p:G
-I:110:14d8:20:22:40
-W:17:1:1500:36
-E:1:1:1:2:1:1
-O:10:0:90:0
-B:HIT:HURT:4d3
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_1D2 | EVIL |
-F:DROP_SKELETON | DROP_CORPSE | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | CTHANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 |
-S:S_MONSTER | MIND_BLAST
-D:A robed humanoid dedicated to a demonic outer god. 
-
-N:1018:Cult leader
-G:p:G
-I:120:52d14:20:60:10
-W:47:2:1800:1800
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:HIT:HURT:6d4
-B:HIT:HURT:6d4
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | CTHANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CONF | CAUSE_3 | 
-S:S_MONSTER | S_UNDEAD | S_DEMON | BA_CHAO | BRAIN_SMASH
-D:An evil priest, dressed all in black and devoted to one of the netherworld
-D:demons that call themselves "the outer gods". 
-
-N:1019:Servitor of the outer gods
-G:H:y
-I:130:100d35:30:140:255
-W:41:6:2100:15000
-E:0:0:0:0:0:0
-O:10:20:70:0
-B:GAZE:TERRIFY:4d4
-B:HIT:HURT:8d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NONLIVING | 
-F:RES_TELE | ELDRITCH_HORROR | SHAPECHANGER | ATTR_MULTI | 
-F:CTHANGBAND
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | BO_MANA | 
-S:S_UNDEAD
-D:"Toad-like creatures which seemed constantly to be changing shape and 
-D:appearance, and from whom emanated, by some means I could not distinguish, 
-D:a ghostly ululation, a piping." August Derleth - "The Lurker at The 
-D:Threshold". 
-
-N:1020:Avatar of Nyarlathotep
-G:p:R
-I:120:25d25:20:70:20
-W:45:2:0:500
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR | SHAPECHANGER | ELDRITCH_HORROR | NONLIVING | 
-F:MALE | OPEN_DOOR | BASH_DOOR | 
-F:CTHANGBAND | HAS_LITE
-D:The Crawling Chaos with a thousand forms. Nyarlathotep is amused at your 
-D:puny attempts to kill him, and will keep coming back for another go 
-D:until he gets bored with the game. 
-
-N:1021:Thiazi, the Storm Giant
-G:P:B
-I:130:99d110:50:160:20
-W:78:2:0:45000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:ELEC:9d11
-B:HIT:HURT:9d11
-B:HIT:ELEC:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_COLD | CAN_FLY | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | AURA_ELEC | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | IM_POIS | SUSCEP_COLD | GIANT | DEMON
-F:ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_ELEC | BR_PLAS | BR_MANA | BLIND | TELE_TO | S_KIN | S_HI_DRAGON | 
-S:HAND_DOOM | TELE_AWAY
-D:Thiazi is the greatest of all the Storm Giants: when travelling, he takes 
-D:the form of a giant eagle.  It was he who succeeded in kidnapping Iduna and 
-D:her apples of youth from Asgard itself. 
-
-N:1022:Hypnos, Lord of Sleep
-G:p:G
-I:130:51d99:20:150:10
-W:67:2:5000:36000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:2d25
-B:GAZE:PARALYZE:1d20
-B:GAZE:TERRIFY:1d20
-B:GAZE:BLIND:1d20
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:NO_STUN | RES_DISE | RES_NEXU | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL | SMART | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:NO_SLEEP | NO_CONF | NO_STUN | IM_POIS | IM_COLD | IM_FIRE | IM_ACID
-F:ZANGBAND | HAS_LITE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:RES_TELE
 S:1_IN_3
-S:BR_NEXU | BR_CHAO | HOLD | SLOW | BR_INER | BA_NUKE |
-S:MIND_BLAST | BRAIN_SMASH | CONF | BLIND | TELE_TO | HEAL |
-S:TELE_AWAY | TELE_LEVEL | TPORT | S_UNDEAD | S_DEMON | DRAIN_MANA
-D:"Young with the youth that is outside time, and with a handsome 
-D:bearded face, curved, smiling lips, Olympian brow; and dense locks 
-D:waving and poppy-crowned." 
+S:BA_ELEC
+S:BA_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:S_HI_DEMON
+S:TELE_TO
+D:A gigantic four-armed animated bronze statue, glowing with great heat. 
 
 N:1023:Blue dragon worm
 G:w:B
@@ -17956,13 +23870,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ELEC
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ELEC
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Sparks fly from its jaws.
 
@@ -17975,13 +23897,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_COLD | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_COLD
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_COLD
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_COLD
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Its breath condenses in the air.
 
@@ -17994,13 +23924,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_POIS | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can smell foul gases 
 D:on its breath.
@@ -18014,13 +23952,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ACID
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Acidic drool drips from its jaws.
 
@@ -18033,13 +23979,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_FIRE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_FIRE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_FIRE
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Smoke comes from its mouth. 
 
@@ -18052,13 +24006,29 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 | ATTR_MULTI | 
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | IM_FIRE | IM_ACID | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC | BR_COLD | BR_FIRE | BR_ACID | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales shimmer different 
 D:colours as you watch. 
@@ -18073,9 +24043,13 @@ B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | UNIQUE | SPECIAL_GENE | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:SPECIAL_GENE
+F:UNIQUE
 D:It is a cross between a human and a bull. 
 
 N:1030:The Sandworm Queen
@@ -18088,11 +24062,32 @@ B:CLAW:ACID:5d4
 B:CLAW:POISON:5d4
 B:BITE:FIRE:5d4
 B:BITE:ELEC:5d4
-F:FORCE_MAXHP | DROP_60 | ONLY_ITEM | DROP_GREAT | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | FEMALE | POWERFUL | SPECIAL_GENE | REFLECTING |
-F:EVIL | ANIMAL | IM_ELEC | IM_FIRE | IM_ACID | IM_POIS | ESCORT | 
-F:MORTAL | BASEANGBAND | EMPTY_MIND | UNIQUE | NO_CONF
-S:1_IN_2 | BR_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EMPTY_MIND
+F:ESCORT
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BR_POIS
+S:S_KIN
 D:Queen and mother of the sandworms, fear her and her prolific children. 
 
 N:1031:Sandworm
@@ -18105,10 +24100,16 @@ B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:BITE:HURT:5d5
-F:RAND_25 |
-F:FORCE_MAXHP | DROP_CORPSE | POWERFUL | 
-F:EVIL | IM_ELEC | IM_FIRE | IM_POIS | EMPTY_MIND | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:POWERFUL
+F:RAND_25
 S:MULTIPLY
 D:Offbreed of the Sandworm Queen, they are harmless alone... 
 
@@ -18123,17 +24124,41 @@ B:GAZE:UN_BONUS:10d10
 B:GAZE:TIME:10d10
 B:GAZE:INSANITY:10d10
 B:GAZE:INSANITY:10d5
-F:UNIQUE | SPECIAL_GENE | 
-F:FORCE_MAXHP | POWERFUL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | WEIRD_MIND | 
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | IM_ACID | IM_ELEC | AURA_COLD |
-F:IM_POIS | RES_NETH | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:S_UNDEAD | S_DEMON | S_DRAGON | 
-S:S_UNIQUE | S_WRAITH | S_HI_DEMON | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_KIN | 
-S:BR_DISE | BA_NETH
+F:AURA_COLD
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NO_CUT
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
+S:BA_NETH
+S:BR_DISE
+S:S_DEMON
+S:S_DRAGON
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_UNDEAD
+S:S_UNIQUE
+S:S_WRAITH
 D:A disembodied and barely sentient mind, Tik'srvzllat floated 
 D:through the void for eons before being awakened by sorcery, pulled 
 D:into the nether realm, and shaped into the being you see before you.  
@@ -18151,13 +24176,37 @@ B:HIT:INSANITY:5d6
 B:HIT:INSANITY:6d6
 B:HIT:INSANITY:7d6
 B:HIT:INSANITY:6d6
-F:COLD_BLOOD | EMPTY_MIND | KILL_WALL | FORCE_MAXHP | POWERFUL | SPECIAL_GENE | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:ESCORTS | ESCORT | UNIQUE | NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN
-F:CHAR_MULTI | CAN_FLY | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
 S:1_IN_4
-S:BR_CONF | BR_LITE | BR_DARK | BR_WALL
-S:S_KIN | TELE_LEVEL | SHRIEK
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:BR_WALL
+S:SHRIEK
+S:S_KIN
+S:TELE_LEVEL
 D:One of the last creations of the petty dwarves of Ludarin, its existence 
 D:explains their destruction. A creation of finest glass, the body of this 
 D:creature bends and amplifies light in a way that makes you unsure of its 
@@ -18174,14 +24223,37 @@ B:HIT:COLD:4d12
 B:HIT:COLD:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | AURA_COLD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING | DROP_RANDART
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | KILL_WALL | BASEANGBAND | 
-F:HAS_LITE | SPECIAL_GENE
-S:1_IN_4 | 
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_COLD | BO_COLD | BA_NETH | S_UNDEAD | S_DEMON
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:BRAIN_SMASH
+S:BR_COLD
+S:CONF
+S:S_DEMON
+S:S_UNDEAD
 D:It is a massive humanoid demon wreathed in frost, wielding a cruel looking 
 D:pike in its hands. 
 
@@ -18194,11 +24266,31 @@ O:60:0:40:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | KILL_BODY | ESCORT | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_ELEC | IM_POIS | NONLIVING | UNIQUE
-F:HURT_ROCK | NO_CONF | NO_SLEEP | NO_CUT | CHAR_MULTI | BASEANGBAND | SPECIAL_GENE
-F:NO_CUT | DROP_RANDART
-S:1_IN_10 | S_KIN | BO_ACID | BA_FIRE
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:ESCORT
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_10
+S:BA_FIRE
+S:BO_ACID
+S:S_KIN
 D:Deep in the heart of the earth, even the rock itself is sentient 
 D:and has learned to despise intruders. 
 
@@ -18212,12 +24304,29 @@ B:HIT:SHATTER:13d13
 B:HIT:CONFUSE:13d13
 B:HIT:SHATTER:13d13
 B:HIT:CONFUSE:13d13
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | KILL_BODY | KILL_WALL |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | GIANT | HURT_ROCK | BASEANGBAND | HAS_LITE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
 D:The strongest of all the Titans.  Legend has it that he once held the sky 
 D:on his shoulders; and the mountain range that now does so is named after him. 
 
@@ -18231,15 +24340,38 @@ B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 E:1:1:1:2:1:1
 O:0:100:0:0
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GOOD | 
-F:SMART | TAKE_ITEM | BASH_DOOR | HAS_LITE | 
-F:EVIL | GIANT | ESCORT | BASEANGBAND | DROP_CORPSE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_POIS | IM_ELEC
-S:1_IN_3 |
-S:BR_FIRE | BR_COLD | BR_SHAR | BR_SOUN | ROCKET | 
-S:S_MONSTERS | S_KIN | TELE_TO | HEAL 
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_3
+S:BR_COLD
+S:BR_FIRE
+S:BR_SHAR
+S:BR_SOUN
+S:HEAL
+S:ROCKET
+S:S_KIN
+S:S_MONSTERS
+S:TELE_TO
 D:The lord of the Titans, he has broken loose from his confinement in 
 D:the nether hells to seek revenge on the world. 
 
@@ -18252,9 +24384,17 @@ B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 E:0:1:0:2:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | BASH_DOOR | DROP_CORPSE | FRIENDS
-F:ANIMAL | IM_COLD | MORTAL | BASEANGBAND | RES_WATE | NO_CUT
-S:1_IN_5 | BA_WATE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:RES_WATE
+S:1_IN_5
+S:BA_WATE
 D:The sound of a hundred waterfalls rushes through your ears as 
 D:a huge wave of water, vaguely hound-shaped, rushes towards you.
 
@@ -18268,18 +24408,48 @@ B:SPORE:UN_BONUS:10d10
 B:SPORE:EXP_80:10d10
 B:SPORE:TIME:10d10
 B:SPORE:TIME:10d10
-F:UNIQUE | NEVER_MOVE | CAN_SWIM |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE |
-F:REFLECTING | AURA_ELEC | ONLY_ITEM | DROP_4D2 |
-F:DROP_GOOD | DROP_GREAT | FORCE_SLEEP | RES_NETH |
-F:SMART | POWERFUL | RES_TELE | REGENERATE | CAN_FLY |
-F:DG_CURSE | WYRM_PROTECT | EVIL |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN |
-F:JOKEANGBAND | HAS_LITE | RES_WATE | NO_CUT
-S:1_IN_2 |
-S:S_HI_DRAGON | S_KIN | BR_DISI | HEAL | TPORT |
-S:TELE_LEVEL | TELE_TO
+F:AURA_ELEC
+F:CAN_FLY
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BR_DISI
+S:HEAL
+S:S_HI_DRAGON
+S:S_KIN
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:An assistant to DarkGod, Improv has chosen the form of a dense 
 D:purple smog for his incarnation into Middle-earth. It travels the 
 D:dungeons, killing software bugs and creating random artifacts for 
@@ -18295,15 +24465,35 @@ B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
-F:MIMIC | UNIQUE
-F:FORCE_SLEEP |
-F:EMPTY_MIND | COLD_BLOOD |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | FORGET | 
-S:BA_ACID | BA_FIRE | BA_COLD | BA_ELEC | 
-S:S_MONSTER | S_KIN | SHRIEK | BRAIN_SMASH | TRAPS
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MIMIC
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNIQUE
+S:1_IN_1
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:SCARE
+S:SHRIEK
+S:S_KIN
+S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -18313,10 +24503,18 @@ I:110:1d1:40:250:3
 W:1:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:FEMALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_DEATH
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:SPECIAL_GENE
+F:UNIQUE
 D:She seems to seek someone, you may help...
 
 N:1042:Thrain, the King Under the Mountain
@@ -18325,10 +24523,18 @@ I:110:1d1:40:250:3
 W:60:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:SPECIAL_GENE
+F:UNIQUE
 D:He must have suffered horrible tortures...
 
 N:1043:Fire golem
@@ -18341,11 +24547,20 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:FIRE:3d6
 B:HIT:FIRE:3d6
-F:BASH_DOOR | AURA_FIRE | HAS_LITE
-F:IM_FIRE | SPECIAL_GENE
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | NO_STUN
-F:MORTAL | BASEANGBAND | NO_CUT | AI_PLAYER
-S:1_IN_10 | 
+F:AI_PLAYER
+F:AURA_FIRE
+F:BASH_DOOR
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:SPECIAL_GENE
+S:1_IN_10
 S:BR_FIRE
 D:A sentient mass of pure fire. 
 
@@ -18359,20 +24574,63 @@ B:HIT:ABOMINATION:3d10
 B:HIT:TIME:24d10
 B:HIT:INSANITY:24d10
 B:HIT:LOSE_ALL:24d10
-F:UNIQUE | CAN_SPEAK | MALE |
-F:FORCE_MAXHP | SPIRIT
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_FIRE |
-F:REGENERATE | POWERFUL | SPECIAL_GENE | CAN_FLY | KILL_TREES
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND |
-S:1_IN_4 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | S_KIN |
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH | HEAL | BRAIN_SMASH |
-S:DRAIN_MANA | TELE_TO | DARKNESS | SHRIEK
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:SPIRIT
+F:UNIQUE
+S:1_IN_4
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:DARKNESS
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HEAL
+S:SHRIEK
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_TO
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:You banned him here, in the Void, and now you must destroy him 
 D:forever. However here in the Void, his spirit gained much power 
@@ -18392,9 +24650,13 @@ E:0:1:1:2:0:0
 O:25:0:75:0
 B:TOUCH:EXP_80:10d10
 B:TOUCH:EXP_80:10d10
-F:SPIRIT | BASEANGBAND | NEVER_MOVE | EMPTY_MIND | NO_CUT |
-F:COLD_BLOOD | INVISIBLE 
-S:1_IN_1 |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CUT
+F:SPIRIT
+S:1_IN_1
 S:BA_NETH
 D:This strange, almost intangible spirit keeps assaulting you! 
 
@@ -18409,8 +24671,11 @@ B:TOUCH:POISON:10d10
 B:CRAWL:POISON:10d10
 B:CRAWL:EAT_ITEM:10d9
 B:BITE:UN_BONUS:9d9
-F:SPIRIT | BASEANGBAND | WEIRD_MIND | FRIENDS |
-F:AI_ANNOY | PASS_WALL
+F:AI_ANNOY
+F:FRIENDS
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
 S:MULTIPLY
 D:These things multiply at an apparently unstoppable rate! 
 
@@ -18424,9 +24689,15 @@ O:0:0:0:0
 B:TOUCH:LOSE_DEX:2d3
 B:TOUCH:PARALYZE:1d12
 B:TOUCH:PARALYZE:1d12
-F:SPIRIT | BASEANGBAND | NO_SLEEP | PASS_WALL | WEIRD_MIND 
-S:1_IN_2 |
-S:SLOW | BLINK | HOLD | HASTE
+F:NO_SLEEP
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLINK
+S:HASTE
+S:HOLD
+S:SLOW
 D:Coming towards you quickly, it seems intent on moving faster than you. 
 
 # Spirit of confusion
@@ -18440,11 +24711,24 @@ B:ENGULF:HALLU:16d8
 B:ENGULF:HALLU:16d8
 B:ENGULF:CONFUSE:16d8
 B:ENGULF:CONFUSE:16d8
-F:SPIRIT | BASEANGBAND | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY | ATTR_MULTI |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_CUT
-S:1_IN_3 |
-S:BR_CHAO | BR_NEXU | BR_CONF
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RES_NEXU
+F:SPIRIT
+S:1_IN_3
+S:BR_CHAO
+S:BR_CONF
+S:BR_NEXU
 D:A swirling mass, constantly changing its appearance. 
 
 # Spirit of brawn
@@ -18458,10 +24742,23 @@ B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
 B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
-F:SPIRIT | BASEANGBAND | DROP_4D2 | KILL_BODY | KILL_WALL |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | KILL_TREES | 
-F:EVIL | GIANT | HURT_ROCK | BASEANGBAND | HAS_LITE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_TREES
+F:KILL_WALL
+F:OPEN_DOOR
+F:SPIRIT
 D:Strong and swarthy, this spirit could bend metal with his bare hands.
 
 # Spirit of Wyrms
@@ -18475,19 +24772,65 @@ B:CLAW:HURT:10d15
 B:CLAW:HURT:10d15
 B:BITE:HURT:14d18
 B:BITE:HURT:14d18
-F:SPIRIT | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | KILL_TREES | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_3 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:SPIRIT
+S:1_IN_3
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:This spirit bears a remarkable similarity to some of the most powerful 
 D:types of dragonkind found in Middle-earth. It appears to be even more 
 D:fearsome though! 
@@ -18502,11 +24845,22 @@ O:25:20:25:20
 B:BITE:POISON:15d15
 B:BITE:POISON:15d15
 B:BITE:LOSE_ALL:10d12
-F:SPIRIT | CAN_SWIM | IM_POIS | IM_ACID |
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | BASEANGBAND
-S:1_IN_4 |
-S:BA_POIS | S_MONSTER | SCARE | HOLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BA_POIS
+S:HOLD
+S:SCARE
+S:S_MONSTER
 D:It slides towards you, a horrible scaly, slidy thing. 
 
 # Spirit of seeing
@@ -18520,11 +24874,24 @@ B:GAZE:UN_BONUS:12d12
 B:GAZE:UN_POWER:12d10
 B:GAZE:INSANITY:12d14
 B:GAZE:LOSE_ALL:6d6
-F:SPIRIT | BASH_DOOR | EVIL | IM_POIS | 
-F:CAN_FLY | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_NETH | BA_ACID | BA_FIRE | BA_COLD 
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_POIS
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:You will find it difficult to avoid being seen by this spirit! And 
 D:once it has you in its sight, beware! 
 
@@ -18539,12 +24906,29 @@ B:TOUCH:UN_BONUS:12d12
 B:TOUCH:UN_POWER:12d10
 B:TOUCH:INSANITY:12d14
 B:TOUCH:LOSE_ALL:6d6
-F:SPIRIT | CAN_FLY | REFLECTING |
-F:SMART | BASH_DOOR | COLD_BLOOD | INVISIBLE | EMPTY_MIND |
-F:EVIL | BASEANGBAND | CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR
-S:1_IN_3 | 
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | 
-S:HEAL | TELE_AWAY | DARKNESS | TRAPS | FORGET | SHRIEK
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:INVISIBLE
+F:REFLECTING
+F:SMART
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:SCARE
+S:SHRIEK
+S:TELE_AWAY
 D:Hopefully you will kill this spirit before you realise it exists. 
 
 # Spirit of ickyness
@@ -18558,12 +24942,23 @@ B:CRAWL:POISON:12d14
 B:CRAWL:EAT_FOOD:12d14
 B:TOUCH:ACID:13d15
 B:HIT:HURT:13d15
-F:SPIRIT | BASEANGBAND |
-F:EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
-F:EMPTY_MIND 
-S:1_IN_4 | 
-S:DRAIN_MANA | BLIND | CONF | SCARE | S_KIN
+F:BASH_DOOR
+F:EMPTY_MIND
+F:EMPTY_MIND
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BLIND
+S:CONF
+S:DRAIN_MANA
+S:SCARE
+S:S_KIN
 D:A horrible slimy spirit, that seems to ooze evilness. I wouldn't get 
 D:too close to it if I were you. 
 
@@ -18578,10 +24973,12 @@ B:BITE:HURT:12d12
 B:BITE:HURT:12d12
 B:BITE:HURT:12d8
 B:BITE:HURT:12d8
-F:SPIRIT | BASEANGBAND |
-F:ESCORT | ESCORTS |
-F:OPEN_DOOR | BASH_DOOR 
-S:1_IN_2 | 
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
 S:S_KIN
 D:This spirit appears to have lots of friends! 
 
@@ -18596,11 +24993,21 @@ B:WAIL:TERRIFY:8d9
 B:HIT:HURT:10d10
 B:HIT:ABOMINATION:6d10
 B:HIT:ABOMINATION:6d10
-F:SPIRIT | BASEANGBAND |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | NO_CUT 
-S:1_IN_3 |
-S:SCARE | HOLD | DARKNESS | SCARE 
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
 D:It seems to have been woken from the dead, this spirit. It lumbers 
 D:towards you, seeking to turn you into a form as hideous as its own! 
 
@@ -18616,9 +25023,19 @@ O:0:100:0:0
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | KILL_BODY | KILL_WALL |
-F:BASH_DOOR | EVIL | GIANT | HURT_ROCK | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:GIANT
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:SPIRIT
 D:It is coming for you, this massive imposing tower of strength.
 D:It appears almost unstoppable! 
 
@@ -18632,12 +25049,26 @@ O:0:0:100:0
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_MANA | BO_FIRE | BO_COLD | BO_ELEC | 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_MANA
+S:CONF
+S:HASTE
+S:TELE_TO
+S:TPORT
 D:This spirit looks very clever, cunning almost. 
 
 # Spirit of wisdom
@@ -18650,12 +25081,23 @@ O:0:50:50:0
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HEAL | MIND_BLAST | CAUSE_4 | SCARE | 
-S:DRAIN_MANA | BRAIN_SMASH | FORGET |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:MIND_BLAST
+S:SCARE
 D:This spirit has something of a priestly look about it. 
 
 # Spirit of dexterity
@@ -18668,10 +25110,17 @@ O:0:50:25:25
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_1 |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_1
 S:ARROW_4
 D:This spirit moves almost too quickly for you to see him. 
 
@@ -18685,8 +25134,15 @@ O:0:50:0:50
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:SPIRIT
 D:This spirit moves slower than most, but thunders on and on 
 D:towards you. 
 
@@ -18700,11 +25156,21 @@ O:70:10:10:10
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | EVIL | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:TRAPS | ARROW_3 | BLINK | TELE_TO | CONF 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_3
+S:BLINK
+S:CONF
+S:TELE_TO
 D:There is something attractive about this spirit, and it seems 
 D:to have a full purse. 
 
@@ -18720,9 +25186,14 @@ O:25:60:0:15
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
-F:SPIRIT | BASEANGBAND | AI_ANNOY | IM_FIRE | AURA_FIRE | HAS_LITE
-S:1_IN_2 |
-S:BO_FIRE | BA_FIRE
+F:AI_ANNOY
+F:AURA_FIRE
+F:HAS_LITE
+F:IM_FIRE
+F:SPIRIT
+S:1_IN_2
+S:BA_FIRE
+S:BO_FIRE
 D:Flickering towards you, and then away, this spirit will burn you badly! 
 
 # Spirit of icy cold
@@ -18735,10 +25206,14 @@ O:25:60:0:15
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
-F:SPIRIT | BASEANGBAND | IM_COLD | AURA_COLD | 
-F:COLD_BLOOD | BASH_DOOR 
-S:1_IN_2 |
-S:BO_COLD | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:IM_COLD
+F:SPIRIT
+S:1_IN_2
+S:BA_COLD
+S:BO_COLD
 D:The temperature around you drops as soon as you set eyes on this spirit. 
 
 # Spirit of corrosion (acid)
@@ -18751,9 +25226,13 @@ O:25:60:0:15
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
-F:SPIRIT | BASEANGBAND | IM_ACID | BASH_DOOR | KILL_TREES 
-S:1_IN_2 |
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:IM_ACID
+F:KILL_TREES
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BO_ACID
 D:The very fabric of the void heals itself where this spirit walks. 
 
 # Spirit of shocking (electricity)
@@ -18766,9 +25245,13 @@ O:25:60:0:15
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:SPIRIT | BASEANGBAND | IM_ELEC | AURA_ELEC | BASH_DOOR 
-S:1_IN_2 |
-S:BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:IM_ELEC
+F:SPIRIT
+S:1_IN_2
+S:BA_ELEC
+S:BO_ELEC
 D:The air crackles as this spirit approaches, and you smell singed flesh. 
 
 # Spirit of Valaraukar (Balrogs)
@@ -18782,12 +25265,27 @@ B:HIT:FIRE:11d12
 B:HIT:FIRE:11d12
 B:CRUSH:HURT:10d12
 B:TOUCH:UN_POWER
-F:SPIRIT | CAN_FLY | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | EVIL | DEMON | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | BR_FIRE 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:EVIL
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
 D:Carrying a whip of fire, this spirit looks not dissimilar to a certain 
 D:Balrog. 
 
@@ -18802,11 +25300,26 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:EXP_80:20d8
 B:TOUCH:EXP_40:20d8
-F:SPIRIT | BASEANGBAND | REFLECTING | REGENERATE |
-F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS | RES_TELE |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL 
-S:1_IN_3 |
-S:BLIND | HEAL | BA_DARK | HASTE | CONF 
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:CONF
+S:HASTE
+S:HEAL
 D:Deriving his strength from the shadows, this spirit 
 D:steals only for the challenge. 
 
@@ -18821,14 +25334,35 @@ B:HIT:HURT:10d9
 B:HIT:HURT:9d9
 B:BITE:EXP_80:9d9
 B:BITE:EXP_80:9d9
-F:SPIRIT | FORCE_SLEEP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | SPIRIT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:Your blood curdles and your bones chill as this spirit approaches. 
 
 # Spirit of unresistability (hehehehe)
@@ -18842,13 +25376,28 @@ B:HIT:SHATTER:18d10
 B:HIT:SHATTER:18d10
 B:HIT:LOSE_ALL:8d8
 B:TOUCH:UN_POWER
-F:BASEANGBAND | SPIRIT | SMART | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL |
-F:RES_NEXU | RES_NETH | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-S:1_IN_2 |
-S:BA_MANA | BR_PLAS | BR_TIME | ROCKET | HAND_DOOM | FORGET | BA_WATE
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BA_MANA
+S:BA_WATE
+S:BR_PLAS
+S:BR_TIME
+S:FORGET
+S:HAND_DOOM
+S:ROCKET
 D:This spirit appears to be afraid of very little, and confident in its 
 D:ability to destroy you. 
 
@@ -18863,11 +25412,19 @@ B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND
-S:1_IN_2 | 
-S:BR_TIME | SLOW | HASTE | HOLD
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BR_TIME
+S:HASTE
+S:HOLD
+S:SLOW
 D:All at once you see that which is to come and that which has gone before. 
 
 # Spirit of Gold
@@ -18881,12 +25438,28 @@ B:TOUCH:EAT_GOLD:7d15
 B:TOUCH:EAT_GOLD:7d15
 B:HIT:POISON:6d12
 B:HIT:POISON:6d12
-F:ONLY_GOLD | SPIRIT | BASEANGBAND |
-F:DROP_4D2 | DROP_4D2 | DROP_4D2 | REFLECTING | COLD_BLOOD | REGENERATE | 
-F:BASH_DOOR | MOVE_BODY | IM_ELEC | IM_COLD | IM_POIS | 
-F:RES_TELE | NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP
-S:1_IN_4 | 
-S:ARROW_4 | HEAL | FORGET 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_4D2
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_GOLD
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+S:1_IN_4
+S:ARROW_4
+S:FORGET
+S:HEAL
 D:It is the very essence of financial greed... 
 
 # Spirit of doom 
@@ -18899,11 +25472,18 @@ O:0:10:90:0
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HAND_DOOM | CAUSE_4 | DARKNESS 
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:CAUSE_4
+S:DARKNESS
+S:HAND_DOOM
 D:The very presence of this creature fills the air with an aura of doom. 
 D:You feel waves of depression descending on you as it approaches. 
 
@@ -18916,12 +25496,23 @@ E:0:1:0:6:1:0
 B:CLAW:HURT:14d10
 B:CLAW:HURT:14d10
 B:BITE:HURT:17d10
-F:INVISIBLE | CAN_FLY | SPIRIT | WEIRD_MIND |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | SPIRIT
-S:1_IN_2 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:CAN_FLY
+F:EVIL
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:SPIRIT
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:This sprit seems to flicker in and out of this plane, and is a master 
 D:of light and dark.
 
@@ -18935,9 +25526,15 @@ O:10:90:0:0
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | ONLY_ITEM |
-F:MORTAL | BASEANGBAND | HAS_LITE | SPIRIT
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPIRIT
 D:Stupid but strong, this spirit has an orcish aura about him.
 
 ### Here endeth the Spirits ###
@@ -18953,22 +25550,41 @@ O:0:5:90:5
 # Sorceror, not warrior
 B:HIT:HURT:1d1
 B:HIT:HURT:1d1
-F:OPEN_DOOR | SMART | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | HAS_LITE | JOKEANGBAND | UNIQUE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
 # Trone, of course
-F:CAN_FLY | REFLECTING | IM_FIRE
+F:CAN_FLY
+F:IM_FIRE
+F:REFLECTING
 # Thorin
-F:IM_ACID | FORCE_MAXHP
+F:FORCE_MAXHP
+F:IM_ACID
 # No cold or random gen... waiting on elven rings only at bottom of Erebor
 F:SPECIAL_GENE
 # Dig
 F:KILL_WALL
 # Obvious resistances
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
 # Well, he's been there a while
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ONLY_ITEM
 # Essence of speed, Manathrust, Noxious Cloud, and Fireflash
-S:1_IN_1 | 
-S:HASTE | BO_MANA | BA_POIS | BA_FIRE
+S:1_IN_1
+S:BA_FIRE
+S:BA_POIS
+S:BO_MANA
+S:HASTE
 D:He looks like he is looking for something, and the flecks of dragon
 D:blood on his face tell you he means business!
diff --git a/lib/edit/ra_info.txt b/lib/edit/ra_info.txt
index 30ff3f38..6ac58484 100644
--- a/lib/edit/ra_info.txt
+++ b/lib/edit/ra_info.txt
@@ -1529,14 +1529,16 @@ X:20:1
 T:35:0:255
 W:10:1:17
 C:0:0:0:0
-F:SH_FIRE | RES_FIRE
+F:RES_FIRE
+F:SH_FIRE
 
 N:338
 X:22:1
 T:35:0:255
 W:10:1:20
 C:0:0:0:0
-F:SH_ELEC | RES_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 N:339
 X:18:1
@@ -1797,7 +1799,6 @@ T:40:0:255
 T:45:0:255
 W:1:1:12
 C:0:0:0:6
-F:SEARCH
 
 N:460
 X:10:1
@@ -1879,7 +1880,6 @@ X:12:1
 T:39:0:255
 W:1:1:10
 C:0:0:0:4
-F:SEARCH
 
 N:508
 X:12:1
diff --git a/lib/edit/re_info.txt b/lib/edit/re_info.txt
index c1fb01c8..f71da68d 100644
--- a/lib/edit/re_info.txt
+++ b/lib/edit/re_info.txt
@@ -33,11 +33,35 @@ G:s:*
 I:%100:+1d+1:+0:+5:-5
 W:+5:13:%30:%95:B
 F:DROP_SKELETON
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_SKELETON | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF | 
-M:NO_SLEEP | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART | 
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_SKELETON
+M:EMPTY_MIND
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GOOD
+O:DROP_GREAT
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:2:Zombie
@@ -45,11 +69,36 @@ G:z:*
 I:%95:%110d%100:%90:+10:-5
 W:+10:14:%70:%100:B
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_CORPSE | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | EVIL | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_SKELETON | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_CORPSE
+M:EMPTY_MIND
+M:EVIL
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_GOOD
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:3:Lich
@@ -60,15 +109,49 @@ B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:UN_POWER:+0d+0
 B:TOUCH:EXP_40:+0d+0
-F:DROP_SKELETON | SMART | R_CHAR_h | R_CHAR_p | R_CHAR_P | R_CHAR_O
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | SMART | EVIL | COLD_BLOOD
-O:DROP_SKELETON | GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | RAND_25 | RAND_50 | MORTAL
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BRAIN_SMASH | DRAIN_MANA | CAUSE_3 | 
-S:BLIND | HOLD | SLOW | SCARE
+F:DROP_SKELETON
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_h
+F:R_CHAR_p
+F:SMART
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:SMART
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 
 N:4:Spectral
 G:G:*
@@ -77,12 +160,35 @@ W:+20:20:%10:%110:B
 B:*:EXP_20:+0d+0
 B:*:EXP_20:+0d+0
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | PASS_WALL | EVIL | COLD_BLOOD
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | EMPTY_MIND | RAND_50 | MORTAL
-S:1_IN_5 | BLIND | HOLD | SCARE
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:PASS_WALL
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:EMPTY_MIND
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_50
+S:1_IN_5
+S:BLIND
+S:HOLD
+S:SCARE
 T:MF_ALL
 
 N:5:Captain
@@ -93,8 +199,13 @@ B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
-F:R_CHAR_o | R_CHAR_y | R_CHAR_k | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:6:Chieftain
 G:*:*
@@ -104,25 +215,49 @@ B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:7:Shaman
 G:*:r
 I:+0:%90d%100:+10:%90:+0
 W:+2:1:%90:%120:A
-F:R_CHAR_o | R_CHAR_k | R_CHAR_n | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_n
+F:R_CHAR_o
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | MISSILE | CAUSE_1 | CONF | BLINK
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:CONF
+S:MISSILE
 
 N:8:Priest
 G:*:G
 I:+0:%90d%100:+10:%90:+0
 W:+3:2:%90:%120:A
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FRIENDS | SMART | FORCE_MAXHP | DROP_1D2
-S:1_IN_6 | CAUSE_2 | MISSILE | DARKNESS | CONF | SCARE | BLINK
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
+S:1_IN_6
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:MISSILE
+S:SCARE
 
 N:9:Mage
 G:*:r
@@ -132,24 +267,38 @@ B:*:*:+0d+0
 B:*:*:+0d+0
 B:HIT:HURT:=2d=8
 B:HIT:HURT:=2d=8
-F:R_CHAR_O | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_O
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | BA_COLD | BO_FIRE | TRAPS | HEAL | HOLD | S_MONSTER | TPORT
+S:1_IN_6
+S:BA_COLD
+S:BO_FIRE
+S:HEAL
+S:HOLD
+S:S_MONSTER
+S:TPORT
 
 N:10:Archer
 G:*:W
 I:+0:+0d+0:+0:+0:+0
 W:+1:1:%100:%110:A
-F:R_CHAR_y | R_CHAR_k | R_CHAR_O | R_CHAR_o | BASEANGBAND
-S:1_IN_4 | ARROW_2
+F:R_CHAR_O
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+S:1_IN_4
+S:ARROW_2
 
 N:11:Rogue
 G:*:b
 I:+2:+0d+0:+0:+10:-30
 W:+1:2:%90:%100:A
 B:*:EAT_GOLD:+0d+0
-F:R_CHAR_y | R_CHAR_k | R_CHAR_o
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
 
 # For townpeople
 N:12:Elven
diff --git a/lib/edit/readme.txt b/lib/edit/readme.txt
index 4c0ecbe7..70cf126e 100644
--- a/lib/edit/readme.txt
+++ b/lib/edit/readme.txt
@@ -77,11 +77,6 @@
 # Defines the preferences for the town features
 # You will find there entries as in f_info.txt
 
-# File: tr_info.txt
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-# You will find traps like 'Summon Fast Quylthulgs Trap' , 'Wisdom Trap' etc.
-
 # File: v_info.txt
 # This file is used to initialize the "vault template" information for the Angband game.
 # You will find vaults like 'The I in the Storm' , 'Greater vault (mortuary temple of sety)' , 
diff --git a/lib/edit/s_crypt.map b/lib/edit/s_crypt.map
index 3d6ce71c..e6600cd6 100644
--- a/lib/edit/s_crypt.map
+++ b/lib/edit/s_crypt.map
@@ -67,30 +67,30 @@ D:X.%%@=-=-X99X.....X..XLL..X%X..LLX..XhVV..X99X=-=-..GGX
 D:X%%@@...XXX9XX....XX.XX...X.X...XX.XXVVVVXX9XXX=-=.XGGX
 D:X@@@....X8X-=XgggggX..X..dX4Xd..X..XWWWWWX-=X8X-=-.XGGX
 D:X......XX%XX=XXgddgXX.XX8GXXXG8XX.XXWWWWXX-XX%XX...XGGX
-D:XIXIXXIX*X=X-=XgddggX..X8G^.^G8X..XWWWWWX-=X.X.X&&&XGGX
-D:XXXIXIXX*X-XX=XXggggXX.XXG^.^GXX.XXWWWWXX-XX.X.XX&&XGGX
-D:XXXXXIX**X=-X=-XIIXXXX..XG^.^GX..XVWWWVX=-XX.XddX@@XGGX
-D:X^^^^XX**X=-XX=XXIXIIXX.XX^.^XX.XXVVVVXX-XX%.XedXX@XGGX
-D:X^^f^Xe**X%%.X=-XXIXXIXbbX^.^XbbX.VV.XX=-XbX.XXXIX@IIGX
-D:X^^^XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
-D:X^^XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
-D:X^XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
+D:XIXIXXIX*X=X-=XgddggX..X8G...G8X..XWWWWWX-=X.X.X&&&XGGX
+D:XXXIXIXX*X-XX=XXggggXX.XXG...GXX.XXWWWWXX-XX.X.XX&&XGGX
+D:XXXXXIX**X=-X=-XIIXXXX..XG...GX..XVWWWVX=-XX.XddX@@XGGX
+D:X....XX**X=-XX=XXIXIIXX.XX...XX.XXVVVVXX-XX%.XedXX@XGGX
+D:X..f.Xe**X%%.X=-XXIXXIXbbX...XbbX.VV.XX=-XbX.XXXIX@IIGX
+D:X...XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
+D:X..XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
+D:X.XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:XX.bababa%eWG.%.BXXXbcbbbbX.XbbbbcbXXXC...fX.%.......XX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:X8XXcbab.XVdG.cXX=-XXX.XXabXbaXXLXXX=-XXbbbX.XaaaaaXX.X
 D:X88XXbbb.XGGG.XX=-XX...XbbXDXbbXLLLXX=-XXbbX.XaaaaXXX.X
 D:XXXIXXe..X...XX=-XX.GGXXbXX.XXbXXILIXX=-XXbX.XaaaXXXX.X
-D:X9889Xe**X%%.X=-XXG.GdXbbX^.^XbbXILLIXX=-XbX.XXXIXhGG.X
-D:XXIXXXX**X=-XX=XXdG.GXX.XX^.^XX.XXILIIXX-XX%.XedXXXXX.X
-D:X99999X**X=-X=-XGGG..X..XI^a^IX..XILLIIX=-XX.XddX..eeeX
-D:XXXXIXXX*X=XX-XX....XX.XXI^a^IXX.XXILLIXX=XX.X.XX.GGGGX
-D:X^^^^^cX*X-X=-X.....X..X.I^a^I.X..XIILLIX=-X.X.Xdddd..X
-D:XllllX^XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
-D:X^^^cl^=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
-D:XLLX^l^-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
-D:X..L^l^=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
-D:X7.L^l^=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
+D:X9889Xe**X%%.X=-XXG.GdXbbX...XbbXILLIXX=-XbX.XXXIXhGG.X
+D:XXIXXXX**X=-XX=XXdG.GXX.XX...XX.XXILIIXX-XX%.XedXXXXX.X
+D:X99999X**X=-X=-XGGG..X..XI.a.IX..XILLIIX=-XX.XddX..eeeX
+D:XXXXIXXX*X=XX-XX....XX.XXI.a.IXX.XXILLIXX=XX.X.XX.GGGGX
+D:X.....cX*X-X=-X.....X..X.I.a.I.X..XIILLIX=-X.X.Xdddd..X
+D:XllllX.XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
+D:X...cl.=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
+D:XLLX.l.-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
+D:X..L.l.=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
+D:X7.L.l.=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXIIIIXIIIIXXIIIXIIIIXXIIIXXXXggggXc..cXaaaaXbb.CX
 D:XIIIIIXIXXIIIXXIIXIXIXIXXIXXIXIXXXXgddg%....%aaaa%bb..X
diff --git a/lib/edit/s_doom.map b/lib/edit/s_doom.map
index 5be3b67d..12ff7d06 100644
--- a/lib/edit/s_doom.map
+++ b/lib/edit/s_doom.map
@@ -15,7 +15,7 @@ F:$:178:0
 F:%:205:0
 
 # Hidden Door
-F:+:48:0:0:0:0:0:0:0:177
+F:+:48:0:0:0:0:0:0:177
 
 # Normal Door
 F:D:32:0
@@ -29,12 +29,6 @@ F:L:85:0
 # Treasure (random) on shallow lava
 F:*:86:0:0:*
 
-# Trap (random) on deep lava
-F:^:85:0:0:0:0:0:*
-
-# Trap (random) on shallow lava
-F:t:86:0:0:0:0:0:*
-
 # up staircase
 F:<:6:0
 
@@ -194,28 +188,28 @@ D:X          #%%NNLL...JJJ....LL#
 D:X #####    #NNNN...Ljjjjj..LLL#   #############################################..1!!!!...L###  X
 D:X##.LL##   #nNNN...LLJJj.LLLLL#   #L....&!&!&....L%%%%%%%L..mRR%R%%M%MML%LL...DL...!1&..@L%%#  X
 D:X#LL<..#   #nn.LL.LLLL...%%%LL#   #..##########################################LLL....LLL%%%#  X
-D:X##%LL##   #....LLL%%LLL..^LLL#   #.L#                                        #LL2.t..q.LLL##  X
+D:X##%LL##   #....LLL%%LLL..LLLL#   #.L#                                        #LL2....q.LLL##  X
 D:X ###+#    #D##############+#######.L#                                       ##%%.LLLL&L...#   X
-D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2...t.##   X
-D:X   #^#    #.############ ##########+#             XXXXXXXXXX                ##.9.t.LLLLL##    X
+D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2.....##   X
+D:X   #L#    #.############ ##########+#             XXXXXXXXXX                ##.9...LLLLL##    X
 D:X   #.#    #LL%%%%LL...p#      #11111#             X########X     ###############.2..LQ#+#     X
-D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.....t...#  ###^L..#(#     X
+D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.........#  ###LL..#(#     X
 D:X  #L##             ##%%V##    #12221#        XXXXXX#..$$..#XXXXXX#LLLLKkk...#    ###D####     X
-D:X  ##!#            ##.VH^%##   #12221#        X######t....m######X#LLLLkkk.LL#      #.#        X
-D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrrt%.mVVVLLe#X#.LL.kkk...#     ##.#        X
-D:X ###D#########   #tiI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
-D:X #.^t^LLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
-D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%ttL.....#X########D###   #.####LAAB##  X
+D:X  ##!#            ##.VHL%##   #12221#        X######.....m######X#LLLLkkk.LL#      #.#        X
+D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrr.%.mVVVLLe#X#.LL.kkk...#     ##.#        X
+D:X ###D#########   #.iI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
+D:X #.L.LLLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
+D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%..L.....#X########D###   #.####LAAB##  X
 D:X #JJJJL%LLL&..#   ##..L.L##                  X#9LLL...%..LL(LLq#X   #..L..#     #.LL..LB%%L#  X
-D:X #J%J..LLL%%LL##   ##.t.##                   X######......######X   #L.####     ###..LL%%%L## X
-D:X #jJJ^..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
-D:X ##....BABLL..L.##   #.uLL^L..L%^^..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
-D:X  ##....B%%L.....##  #################L#          X#LLL..t#X        #..twW#        #L..LL...+pX
+D:X #J%J..LLL%%LL##   ##...##                   X######......######X   #L.####     ###..LL%%%L## X
+D:X #jJJL..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
+D:X ##....BABLL..L.##   #.uLLLL..L%LL..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
+D:X  ##....B%%L.....##  #################L#          X#LLL...#X        #...wW#        #L..LL...+pX
 D:X  ###....LLL...LLL####################.#          X#%L..7.#X        #####L#      ###LL...1###oX
-D:X  #9+L%%L...LLL....D.+..%%oF.%%^..%%LL.#          X#LLLLt.#X            #p#      #%%%!@..## #tX
-D:X  ##################L###.L###..###.L####          X#7tt.LL#X            #.#      #########  #EX
+D:X  #9+L%%L...LLL....D.+..%%oF.%%L..%%LL.#          X#LLLL..#X            #p#      #%%%!@..## #.X
+D:X  ##################L###.L###..###.L####          X#7...LL#X            #.#      #########  #EX
 D:X  ##################.# ##############             X#.LLLL.#X       ######D###################LX
-D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....^LLL%X
+D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....LLLL%X
 D:X     ##1!!!%%%%Lp###L#                            X#L%%%%Q#X       #..LF....K...##############X
 D:X     ##!!%%%%%LLL..#.#                            XXXXDDXXXX########.LLLL..KKK..####          X
 D:X      ##.LLLLLLL...+.#                               #%%%%%%%%%%%%%+LL7..LL.k..L+o7#          X
diff --git a/lib/edit/s_factory.map b/lib/edit/s_factory.map
index 111829f1..f7432f83 100755
--- a/lib/edit/s_factory.map
+++ b/lib/edit/s_factory.map
@@ -83,65 +83,62 @@ F:<:6:0
 F:>:7:0
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:845
+F:1:160:6:0:0:0:0:845
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:846
+F:2:160:6:0:0:0:0:846
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:4370
+F:3:160:6:0:0:0:0:4370
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:3339
+F:4:160:6:0:0:0:0:3339
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:4119
+F:5:160:6:0:0:0:0:4119
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:6659
+F:6:160:6:0:0:0:0:6659
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:9257
+F:7:160:6:0:0:0:0:9257
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:8018
+F:8:160:6:0:0:0:0:8018
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:9298
+F:9:160:6:0:0:0:0:9298
 
 # between gate A
-F:A:160:6:0:0:0:0:0:805
+F:A:160:6:0:0:0:0:805
 
 # between gate B
-F:B:160:6:0:0:0:0:0:831
+F:B:160:6:0:0:0:0:831
 
 # between gate D
-F:D:160:6:0:0:0:0:0:809
+F:D:160:6:0:0:0:0:809
 
 # between gate E
-F:E:160:6:0:0:0:0:0:2826
+F:E:160:6:0:0:0:0:2826
 
 # between gate F
-F:F:160:6:0:0:0:0:0:2831
+F:F:160:6:0:0:0:0:2831
 
 # between gate H
-F:H:160:6:0:0:0:0:0:4631
+F:H:160:6:0:0:0:0:4631
 
 # between gate J
-F:J:160:6:0:0:0:0:0:7198
+F:J:160:6:0:0:0:0:7198
 
 # between gate K
-F:K:160:6:0:0:0:0:0:7990
+F:K:160:6:0:0:0:0:7990
 
 # between gate N
-F:N:160:6:0:0:0:0:0:9253
+F:N:160:6:0:0:0:0:9253
 
 # Treasure on floor
 F:$:1:0:0:*65
 
-# Trap (random) on floor
-F:^:1:0:0:0:0:0:*
-
 
 ### Monsters
 
@@ -203,9 +200,9 @@ D:X&XXXe.XX~XXeeeXX~XXe..XX~~~~~~ttttXX.....X,,,,Ll,ll,X..XII.X.X.i.XXG_XXXXL%%L
 D:X..&..XX~~~XXeXX~?~XX.&X~~~~t~ttttttX.;.;.X,lllll,ll,XX_..XX.XX#X..X#XXf.X_GG_X.fX
 D:XGXGXGX?~~~~_c_~~~~~X.&XX~~~~t~ttttXX.....X,L,,,,,lL,.X.#XXi..G.XXiX..XX.........X
 D:X.....XX~~?XXcXX~~~XXa..XXX__XX__XXXX.;.;.X,L,.XXX%L%XXXXcXX.XXX.X.X.X.XX.X.ff.X.X
-D:XXgXgXgXX~XXcccXX?XXXXX.a^^a.^^a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
-D:XgXgXgXgXXX^^^^^XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
-D:X.......4X.^^5^^.X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
+D:XXgXgXgXX~XXcccXX?XXXXX.a..a...a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
+D:XgXgXgXgXXX.....XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
+D:X.......4X...5...X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
 D:X..&&...XXXXXXXXXXc,c,c.XX_XX..ccXX..#...#..XX#iiX.X.a..a.XX.#XX._X.XX.XX.X....X.X
 D:X......XXEX,,,c,c,cc,ccXXMRMXXc.XX...#...#...XXX#iXXXXXc..IXGX.XXiX.....X........X
 D:XXXXXXXX..X,,,,,,,,,,,XXM..RMXXXX$$XXX...XXX$$XX..XX_GXXXXXX.Ii.X_X.X#XXX.X....X.X
@@ -217,20 +214,20 @@ D:Xs.s._..&.&.XlX_._XlX..gg....X$$$#....%%%....#$$$X.IIX.X..XIXX.X.G#X..dXLl#_._
 D:X.s.s_g....XXlXXGXXlXX.g..d&.XX$$XXXXX...XXXXX$$XXXX._XG#X.XX.X_X.XX.c.XXXX...XXXX
 D:XXXXXXXXXXIXLLLXGXLLLXgg.g.d..XX$$$XXX...XXX$$$XX<...XiXX.X.Xi.X.X.Xd..X.........X
 D:Xgg.gXg.gXIXL%LXGXL%LXGXXX__XXXXX$$XXX...XXX$$XXXXXXIXXiX#XX#XX#X_XX...XXXXXXXIXXX
-D:X^^X^X^X^X^XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
-D:X^^X^X^X^X^Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
-D:X^^X^X^X^X^X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
+D:X..X.X.X.X.XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
+D:X..X.X.X.X.Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
+D:X..X.X.X.X.X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
 D:XH.Xg.gXg.gXla,ca&,f.fl.leXX..%R.RRXX.....XX.G.XX#XXI.XX.#.XGXXXiX.#X.XX.i._X.XGX#
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXGXXXXXXXG.X..X#XXX.XX.XXI._XIX.XIXXI#.XXX.X
 D:X,.,G,&&,ee,ff,hgg,&&,,,.,,I7XXXc..aX.;.;.X&..XXXG#XX.G.XXX..XG######.G.#..##..iXX
-D:X^X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
-D:X^X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
-D:X^X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
-D:X^XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
-D:X^X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
-D:X^X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
-D:X^X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
-D:X,,,G,&&,,gg.&h.ee,ff,..,.,I^XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
+D:X.X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
+D:X.X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
+D:X.X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
+D:X.XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
+D:X.X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
+D:X.X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
+D:X.X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
+D:X,,,G,&&,,gg.&h.ee,ff,..,.,I.XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 
diff --git a/lib/edit/s_gates.map b/lib/edit/s_gates.map
index 3ac7ccbf..37d39f22 100644
--- a/lib/edit/s_gates.map
+++ b/lib/edit/s_gates.map
@@ -55,35 +55,35 @@ F:1:1:0:0:0:0:10
 
 ### Level design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A^^.......dX
-D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B^^........X
-D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX.............^^.......9X
-D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX............^^.......CX
-D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5^^........X
-D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F^^.......dX
+D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A.........dX
+D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B..........X
+D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX......................9X
+D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX.....................CX
+D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5..........X
+D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F.........dX
 D:X%X......@%...aX.X........XIXXXXXXXXXXX..X..XX..XXXXIXXXXXXXXXXXXXXXXX
 D:X.XXX....@%...aX.X..........XXX..>X...X..X...XX..XXXaXaXaXaXaXaXaXaXaX
 D:X...XXX..@%...aI.X..........XXX7..X...D..X.X..XX..XX.................X
 D:X.....XXX@%...aX.X..........XXXXXXXXXXX..X.XX..XX..XX................X
 D:X.......XXX...aX.X..........XXXXXXXaG....X..XX..XX..XX...............X
-D:X..X......XXX.XX%XX^^^^^X...XXXXXXXaG....X...XX..XX..XX..............X
-D:X^^XX.......XXX***X^^^^^X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
-D:X^^XX.........X.6.X^^^^^X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
-D:X..XXX........X***X^^^^^X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
-D:X^^X8X........XXXXX^^^^^X...XIIIIIXVVV.......XX..XX.............bXX..X
+D:X..X......XXX.XX%XX.....X...XXXXXXXaG....X...XX..XX..XX..............X
+D:X..XX.......XXX***X.....X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
+D:X..XX.........X.6.X.....X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
+D:X..XXX........X***X.....X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
+D:X..X8X........XXXXX.....X...XIIIIIXVVV.......XX..XX.............bXX..X
 D:X..X8XX................XX...XXXXXIXVVVV.......XX..XXXXXXXXXXXXXXXXXX+X
-D:X^^X88X................XX...XIIIIIXVVVVVV..@...XX.^^^^^^^^^^^^^a.....X
-D:X^^X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
+D:X..X88X................XX...XIIIIIXVVVVVV..@...XX..............a.....X
+D:X..X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
 D:X..X999X...............XX...XIXXXXXXXXX.VVVV....***********.........bX
-D:X^^XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
+D:X..XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
 D:X..X....X........d.....XX...XIXf......X...VVVVVVV...............@....X
-D:X^^X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
-D:X^^X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
+D:X..X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
+D:X..X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
 D:X..X%%%.%XX..........XXX....XXXXXIX.............@VVVVVVVVVVVV@.......X
-D:X^^X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
+D:X..X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
 D:X..X%%%.%%XX........XX......XXXXXIX@.....................VVVVVVVVVVVVX
-D:X^^X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
-D:X^^^......cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
+D:X..X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
+D:X.........cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -97,9 +97,9 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXLgXXXXXXXXXXXXXXXXXXXXXXXXLLLLXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXfXXXXXXXXLXXXXXXXXXXXXXXXXXXXXXXXXXgLLLLXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXghgXXXXbXXXXXXXXaXXXXXXXXXXXXXXLLLLgXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXg1gXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXgLLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXX^XXXXXXXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXX4..^^^..^^^.......^^^......^^^.........EXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXXXXXXX^XXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXLLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXX.XXXXXXXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXX4......................................EXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXLLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXcXXXXXXXXaXXXXXXXXXXXXXXXLLXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXgLLLXXXXXXXXXX
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt
index d53fb7e0..9ad2eee7 100644
--- a/lib/edit/s_info.txt
+++ b/lib/edit/s_info.txt
@@ -14,10 +14,8 @@
 # N:idx:name
 # D:desc
 # A:action mkey:action desc
-# I:rate
 
 # E:exclusive skill:exclusive skill
-# O:skill:opposing skill%percent
 # A:skill:friendly skill%percent
 
 # T:father:child
@@ -27,139 +25,112 @@
 N:56:Magic-Device
 D:Eases the use of magical devices, such as wands, staves and rods
 D:It also helps pseudo-id of magic objects
-I:1000
 F:RANDOM_GAIN
 
 N:54:Spell-learning
 D:You should not see that ! that is a BUG!
 #A:18:Learn a spell from a realm
-I:1000
 F:HIDDEN
 
 N:41:Sorcery
 D:Ability to use all the magic schools as if their skill was sorcery
 D:But the price to channel that much magic is your health
 A:17:Cast a spell
-I:1000
 
 N:1:Conveyance
 D:Ability to learn and use spells from the Conveyance school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:2:Mana
 D:Ability to learn and use spells from the Mana school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:3:Fire
 D:Ability to learn and use spells from the Fire school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:4:Air
 D:Ability to learn and use spells from the Air school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:5:Water
 D:Ability to learn and use spells from the Water school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:6:Nature
 D:Ability to learn and use spells from the Nature school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:7:Earth
 D:Ability to learn and use spells from the Earth school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:10:Divination
 D:Ability to learn and use spells from the Divination school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:11:Temporal
 D:Ability to learn and use spells from the Temporal school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:14:Meta
 D:Ability to learn and use spells from the Meta school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:51:Mind
 D:Ability to learn and use spells from the Mind school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:55:Udun
 D:Ability to learn and use spells from the Udun school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:HIDDEN
 
 N:13:Demonology
 D:Ability to use incantations from the Demonblades
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:31:Necromancy
 D:Ability to harness the powers of the dead
 D:Spells use the intelligence stat
 A:7:Use Necromancy
-I:1000
 F:RANDOM_GAIN
 G:60
 
-N:34:Runecraft
-D:Ability to combine magic runes to create your own spells
-D:Runespells use the dexterity stat
-A:9:Use Runespells
-I:1000
-
 N:43:Thaumaturgy
 D:Ability to gain and cast innate spells
 D:Spells use the intelligence stat
 A:8:Cast a thaumaturgy spell
-I:1000
 F:RANDOM_GAIN
 
 N:15:Magic
 D:General ability to do magic, also affects mana reserves and
 D:magic device ability. Helps pseudo-id of magic objects
 A:19:Copy a spell
-I:1000
 F:RANDOM_GAIN
 
 N:45:Spell-power
 D:Ability to increase the power of spells
-I:1000
 
 N:59:Geomancy
 D:Ability to understand the raw elemental forces of nature and use
 D:them to your advantage. Most spells need Fire/Water/Earth/Air skills
 A:101:Use Geomancy
-I:1000
 
 # All magic skills affect magic skill
 f:Magic-Device:Magic%7
@@ -183,7 +154,6 @@ f:Mind:Magic%10
 f:Udun:Magic%10
 f:Demonology:Magic%10
 f:Necromancy:Magic%4
-f:Runecraft:Magic%12
 f:Thaumaturgy:Magic%6
 
 
@@ -193,81 +163,65 @@ f:Thaumaturgy:Magic%6
 N:16:Combat
 D:General ability to fight and to pseudo-id armour and weapons
 D:It also allows the use of heavier armour without penalties
-I:1000
 F:RANDOM_GAIN
 
 N:17:Weaponmastery
 D:General ability to use melee weapons
-I:1000
 F:RANDOM_GAIN
 
 N:18:Sword-mastery
 D:Ability to use swords
-I:1000
 
 N:19:Axe-mastery
 D:Ability to use axes
-I:1000
 
 N:20:Polearm-mastery
 D:Ability to use polearms
-I:1000
 
 N:21:Hafted-mastery
 D:Ability to use hafted weapons
-I:1000
 
 N:22:Backstab
 D:Ability to backstab fleeing and sleeping monsters to increase damage
-I:1000
 
 N:23:Archery
 D:General ability to use ranged weapons
-I:1000
 F:RANDOM_GAIN
 
 N:24:Sling-mastery
 D:Ability to use slings
 A:23:Fire piercing shots
-I:1000
 
 N:25:Bow-mastery
 D:Ability to use bows
 A:23:Fire piercing shots
-I:1000
 
 N:26:Crossbow-mastery
 D:Ability to use crossbows
 A:23:Fire piercing shots
-I:1000
 
 N:27:Boomerang-mastery
 D:Ability to use boomerangs
-I:1000
 
 N:58:Boulder-throwing
 D:Ability to make and throw boulders
 A:21:Tear down a wall to create boulders
-I:1000
 
 N:42:Barehand-combat
 D:Ability to fight barehanded
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:47:Bearform-combat
 D:Ability to fight in bear form
-I:1000
-F:HIDDEN | AUTO_HIDE
+F:AUTO_HIDE
+F:HIDDEN
 
 N:52:Critical-hits
 D:Ability to deal critical hits with swords < 5lb
-I:1000
 
 N:57:Stunning-blows
 D:Ability to stun opponents when doing critical hits with hafted weapons > 5 lb
-I:1000
 
 # List of combat friendly skills
 
@@ -299,41 +253,28 @@ f:Boomerang-mastery:Combat%7
 f:Barehand-combat:Combat%50
 f:Boulder-throwing:Combat%40
 
-# No more, let's see how it turns out
-# Sorcery and Weaponmastery aren't exactly friendly to each other
-#O:Sorcery:Weaponmastery%100
-#O:Sorcery:Archery%100
-#O:Sorcery:Barehand-combat%100
-#O:Weaponmastery:Sorcery%100
-#O:Archery:Sorcery%100
-#O:Barehand-combat:Sorcery%100
-
 
 
 ############################### SPIRITUALITY SKILLS ###########################
 
 N:28:Spirituality
 D:General ability to use spiritual skills and also influence your Saving Throw
-I:1000
 F:RANDOM_GAIN
 
 N:53:Prayer
 D:Ability to learn and use spells from the gods' schools
 D:Spells use the wisdom stat and cost piety instead of mana
 A:17:Cast a spell
-I:1000
 
 N:12:Druidistic
 D:Ability to learn and use prayers from the Druidistic realm
 D:Nature powers use the wisdom stat
 A:1:Cast a druidistic spell
-I:1000
 
 N:29:Mindcraft
 D:Ability to focus the powers of the mind
 D:Mindpowers use the wisdom stat
 A:2:Use Mindcraft
-I:1000
 F:RANDOM_GAIN
 G:50
 
@@ -341,7 +282,6 @@ N:9:Music
 D:Ability to learn and sing songs
 D:Songs use the charisma stat
 A:17:Cast a spell
-I:1000
 
 f:Prayer:Spirituality%10
 f:Druidistic:Spirituality%10
@@ -358,12 +298,10 @@ f:Music:Magic%10
 
 N:30:Misc
 D:Not a real skill, it is only used to regroup some skills
-I:0
 
 N:33:Antimagic
 D:Ability to generate an antimagic field
 A:3:Use antimagic
-I:1000
 F:RANDOM_GAIN
 G:80
 
@@ -384,7 +322,6 @@ E:Nature:Antimagic
 E:Udun:Antimagic
 E:Sorcery:Antimagic
 E:Demonology:Antimagic
-E:Runecraft:Antimagic
 E:Necromancy:Antimagic
 E:Mindcraft:Antimagic
 E:Music:Antimagic
@@ -394,37 +331,21 @@ E:Thaumaturgy:Antimagic
 
 ################################## SNEAKINESS SKILLS ###############################
 
-N:35:Sneakiness
-D:General ability at the sneakiness skills.
-D:It also affects the searching abilities
-I:0
-F:RANDOM_GAIN
-
 N:36:Stealth
 D:Ability to move unnoticed, silently
-I:0
-F:RANDOM_GAIN
-
-N:37:Disarming
-D:Ability to disarm the various traps
-I:0
 F:RANDOM_GAIN
 
 N:40:Stealing
 D:Ability to steal objects
 A:15:Steal object
-I:0
 
 N:46:Dodging
 D:Ability to dodge blows and bolts
 A:16:Check dodge chance
-I:0
 
-f:Stealth:Sneakiness%15
-f:Disarming:Sneakiness%10
-f:Backstab:Sneakiness%5
-f:Stealing:Sneakiness%15
-f:Dodging:Sneakiness%10
+f:Backstab:Stealth%5
+f:Stealing:Stealth%15
+f:Dodging:Stealth%10
 
 
 ################################## MONSTER SKILLS ################################
@@ -432,38 +353,32 @@ f:Dodging:Sneakiness%10
 N:48:Monster-lore
 D:General ability at the monster related skills, ability to gain experience
 D:from friendly kills. It also affects the number of companions you can have
-I:0
 A:22:Turn pet into companion
 F:RANDOM_GAIN
 
 N:44:Summoning
 D:Ability to create totems from monsters and use them to summon monsters
 A:13:Manipulate totems
-I:1000
 F:RANDOM_GAIN
 G:60
 
 N:49:Corpse-preservation
 D:Ability not to destroy the monsters' corpses when killing them
-I:0
 
 N:50:Possession
 D:Ability to incarnate into monsters
 A:11:Use the possession skill
-I:0
 
 N:8:Symbiosis
 D:Ability to enter in symbiosis with monsters unable to move by themselves
 D:Spells use the intelligence stat
 A:20:Use symbiotic powers
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:32:Mimicry
 D:Ability to use cloaks of mimicry to change form
 A:6:Use Mimicry
-I:1000
 F:RANDOM_GAIN
 G:80
 
@@ -493,12 +408,10 @@ T:Combat:Bearform-combat
 T:Combat:Boulder-throwing
 T:Combat:Antimagic
 
-T:Main:Sneakiness
-T:Sneakiness:Stealth
-T:Sneakiness:Disarming
-T:Sneakiness:Backstab
-T:Sneakiness:Stealing
-T:Sneakiness:Dodging
+T:Main:Stealth
+T:Stealth:Backstab
+T:Stealth:Stealing
+T:Stealth:Dodging
 
 T:Main:Magic
 T:Magic:Magic-Device
@@ -515,7 +428,6 @@ T:Magic:Nature
 T:Magic:Udun
 T:Magic:Demonology
 T:Magic:Necromancy
-T:Magic:Runecraft
 T:Magic:Thaumaturgy
 
 T:Geomancy:Fire
diff --git a/lib/edit/s_name.map b/lib/edit/s_name.map
index 795d8786..e1a352ef 100644
--- a/lib/edit/s_name.map
+++ b/lib/edit/s_name.map
@@ -62,46 +62,46 @@ F:1:1:0:0:0:0:16
 
 ### Level Design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X.....LLLLLLLLL.....XXX.G=-&&=-G^.........>X
-D:X.LLL...........LLLXX...G=-&.=-G^........1.X
-D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG^..........X
-D:X.L99.L&..........X%....G..&-..G^....j.....X
-D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G^..........X
-D:X....&&&L.......L.L*XXX.G-=&&-=G^^^^^^^^^^^X
+D:X.....LLLLLLLLL.....XXX.G=-&&=-G..........>X
+D:X.LLL...........LLLXX...G=-&.=-G.........1.X
+D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG...........X
+D:X.L99.L&..........X%....G..&-..G.....j.....X
+D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G...........X
+D:X....&&&L.......L.L*XXX.G-=&&-=G...........X
 D:XLLLLLLLL.LLLLL..&L**XXXXXXXGGGG%XXXXXXXXXXX
-D:XXXXXXLL..L***LLLLLLLX^^^^8Xi....%@@^^.^^@@X
-D:X5..8X.&.XXXXXX......D^^^^8XIIIIIXbb^^.^^ccX
-D:X...8X...XA...X.LLLLLX^^^^8X.....X..^^.^^..X
-D:X...8X.XXXC...X.LL...XXXIXXX^^^^^X..^^.^^..X
-D:XGXXXX.LfX7...X&LL.L.Xa^^^aXf...fX..^^.^^..X
-D:X.X5XL.L*XB...X&&..L.X^b^b^X^^^^^X..^^.^^..X
-D:X.X^XL.L*XXXXXXLLLLL.X^^7^^X.....X..^^.^^..X
-D:X.X^XL.L***fXL.....&&X^b^b^XIIIIIX..^^.^^..X
-D:X.X^XL.LLLLLXL.LLLLLLXa^^^aXi....X..^^.^^..X
-D:X.X^XL.........XXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.X^XXXXXXXXXXLX^...^Xe-^=dX^^..&X..^^.^^..X
-D:X.X^^^^^^^^^^XLX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXX^X8Xf^B^.%^^6^^%^^C.&X..^^.^^..X
-D:X.LLLLLLLLL+^XXX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXXXXXX^...^Xd-^=eX^^..&X..^^.^^..X
-D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.XbbbbXXXX^^^^XX....X^^^^^X...h.X..^^.^^..X
-D:X.XbbbXX^^XXX^^^XX...X^ccc^X....0X..^^.^^..X
-D:X.XbbXX.^X%bXX^^^XX..X^.A.^X.....X..^^0^^..X
-D:X.IbXX..XXbbbXX^^^XX.X^ccc^XIXXXXXXXXXXXXXXX
-D:X.XXX..XX.....X%^^^XXX^^^^^XlllllllllllllllX
-D:X.X99.XXW......XX^^^XXXXXXXXlllllllllllllllX
-D:X.X99XXWWW...a..XX^^.XXllllllLLLLLlXXXX%XXXX
-D:X.XXXX..WWW.....cXX^.XXXXXlllllllllXVVVVVVVX
-D:X.X8.....WWW....ccX^.X^^^XLLLlLLLLLXVVVVVVVX
-D:X.X%XXXXXXXWW...cXXX.X+X^XlllllllllXV%%%%%VX
-D:X.X.......XWWW..X%^X.XLX^XlLLLLLLLLXV%8^8%VX
-D:X.XXXXXX%.X.WWWXX^^X.XLX^XlllllllllXV%^a^%VX
-D:X.X.IIIIX.X..WXX..XXcXLX^XLLLlLLLLlXV%^^^%VX
-D:X.X%XXXIX.X..XX..XXccXLX^XlglllLgllXV%^^^%VX
-D:X.Xa.6XIX.X.XX..XXcccXLX^XlllllXXXXXV%^a^%VX
-D:X+XXX.XIX.X.X99XXccccXLX^XXXXXXX888XV%8^8%VX
-D:X%%%Xa%.X.%8X99XcccccXLX^^^^^^4X...XV%%%%%VX
+D:XXXXXXLL..L***LLLLLLLX....8Xi....%@@.....@@X
+D:X5..8X.&.XXXXXX......D....8XIIIIIXbb.....ccX
+D:X...8X...XA...X.LLLLLX....8X.....X.........X
+D:X...8X.XXXC...X.LL...XXXIXXX.....X.........X
+D:XGXXXX.LfX7...X&LL.L.Xa...aXf...fX.........X
+D:X.X5XL.L*XB...X&&..L.X.b.b.X.....X.........X
+D:X.X.XL.L*XXXXXXLLLLL.X..7..X.....X.........X
+D:X.X.XL.L***fXL.....&&X.b.b.XIIIIIX.........X
+D:X.X.XL.LLLLLXL.LLLLLLXa...aXi....X.........X
+D:X.X.XL.........XXXXXXXXX%XXXXXXXXX.........X
+D:X.X.XXXXXXXXXXLX.....Xe-.=dX....&X.........X
+D:X.X..........XLX.....X-...=X....&X.........X
+D:X.XXXXXXXXXX.X8Xf.B..%..6..%..C.&X.........X
+D:X.LLLLLLLLL+.XXX.....X-...=X....&X.........X
+D:X.XXXXXXXXXXXXXX.....Xd-.=eX....&X.........X
+D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX.........X
+D:X.XbbbbXXXX....XX....X.....X...h.X.........X
+D:X.XbbbXX..XXX...XX...X.ccc.X....0X.........X
+D:X.XbbXX..X%bXX...XX..X..A..X.....X....0....X
+D:X.IbXX..XXbbbXX...XX.X.ccc.XIXXXXXXXXXXXXXXX
+D:X.XXX..XX.....X%...XXX.....XlllllllllllllllX
+D:X.X99.XXW......XX...XXXXXXXXlllllllllllllllX
+D:X.X99XXWWW...a..XX...XXllllllLLLLLlXXXX%XXXX
+D:X.XXXX..WWW.....cXX..XXXXXlllllllllXVVVVVVVX
+D:X.X8.....WWW....ccX..X...XLLLlLLLLLXVVVVVVVX
+D:X.X%XXXXXXXWW...cXXX.X+X.XlllllllllXV%%%%%VX
+D:X.X.......XWWW..X%.X.XLX.XlLLLLLLLLXV%8.8%VX
+D:X.XXXXXX%.X.WWWXX..X.XLX.XlllllllllXV%.a.%VX
+D:X.X.IIIIX.X..WXX..XXcXLX.XLLLlLLLLlXV%...%VX
+D:X.X%XXXIX.X..XX..XXccXLX.XlglllLgllXV%...%VX
+D:X.Xa.6XIX.X.XX..XXcccXLX.XlllllXXXXXV%.a.%VX
+D:X+XXX.XIX.X.X99XXccccXLX.XXXXXXX888XV%8.8%VX
+D:X%%%Xa%.X.%8X99XcccccXLX......4X...XV%%%%%VX
 D:X%.%XXXXXXXXXXXXIXXXXXLXXXXXXXXX...XVVVVVVVX
 D:X.%%+..........................G..4X...F...X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/s_ship.map b/lib/edit/s_ship.map
index f429d4ec..69a94fa3 100755
--- a/lib/edit/s_ship.map
+++ b/lib/edit/s_ship.map
@@ -19,8 +19,6 @@
 # I'm not sure esp. about the correct exit of gate #3.
 
 
-#%:special.txt
-
 
 ### Terrain Features
 
@@ -157,15 +155,6 @@ F:$:90:0:0:*47
 # Treasure (good) on ice
 F:%:90:0:0:*60
 
-# Trap (random) on ice
-F:^:90:0:0:0:0:0:*
-
-# Trap (random) on shallow water
-F:t:84:0:0:0:0:0:*
-
-# Trap (random) on fog
-F:@:210:0:0:0:0:0:*
-
 # Human skeleton on ice
 F:x:90:0:0:395
 
@@ -173,16 +162,16 @@ F:x:90:0:0:395
 ### Between Gates
 
 # between gate 3: was 711
-F:3:160:6:0:0:0:0:0:1136
+F:3:160:6:0:0:0:0:1136
 
 # between gate A: was 6247
-F:A:160:6:0:0:0:0:0:6761
+F:A:160:6:0:0:0:0:6761
 
 # between gate 4: was 3339
-F:4:160:6:0:0:0:0:0:3853
+F:4:160:6:0:0:0:0:3853
 
 # between gate B: was 3085
-F:B:160:6:0:0:0:0:0:3599
+F:B:160:6:0:0:0:0:3599
 
 
 ### Guaranteed Items
@@ -197,33 +186,33 @@ D:XXXXXXXXXXXXXXXX                  XXXXXXXXXXXX
 D:X###############..~  .#. k    w ~.#XX######### .~~     s                                 G..#####..  w  .###.######X##~~ .GX.### 
 D:X####%####...~      ~.~      s .#.X#~~.#####  .~                             s       w G..#.##.#.XGG~XXk~.####A####.~X   ~~.X... 
 D:X##%#$#######...~ w       wXXXXXX#XXXX###XXX #~XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..XX....~.XX  X#xX.#..#.#G. w ~X G~~ 
-D:X##$#########....     s   XXXTT^...~.~#####w~###~~~~8....**.tE.&E ^^.M^.xx.....x..ZZ..^XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
-D:X#########...~   w      XXXTTTT.^..x~.H####  ###~~D....8**.~M~.E..M^.MM^..xh.h...ZZZZ^~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
-D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~tE&EE^^~%M^.h.x.E.xh.ZZ..^X.,.^....~ ...G.~  s ~#  XX ~~    w   X   
-D:X######...~~  MM~  w XXX^^XXX.MMMxx...G#####w  ~#~.~..&...**E.MEt.^^.MM^~..i.....ZZZZ^~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
-D:X##.....~~        XXX^E=^XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM^^.M^h..i..x.x..ZZ..^XTTTTX.,.,~........~.G~~..w . G~...G~X    
-D:X...~~~    K    XXX^^EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
-D: ~~~   w      XXX^^EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
-D: w  MMM.  w XXX^E^XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
-D:    MM.   XXX4EEXXXi^**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
-D:   s    XXXBXXXXX^.**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
-D:      XXX.o..X.g***i.*.,.XX%XX######^^^^t      ##ttt^^^^^t^^^^^^t^^^^^t^^^^^^^t^^^^^^t^^^^t^^tt^^^tt^^^^t^tXo..x************X    
-D: k  XXX^E..o.XX8.****,.g..XXX..#........~~~~~ttt###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
-D:  XXX%S^^E..ooX,*****,..,.X.....h........XXX~~~tt#tt   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
-D: XX%%%^mm.E..oXH**.^.*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
-D:  XXX%S^^E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
-D:    XXX^E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
-D: s    XXX.o..X&..w~##..##~~~X~^^^^^^^^^^t^ttt^tt   w   tt^tttt^^tt^^^^^ttt^^^^ttt@@^^^^ttt^^^^^ttt@^^ttXXXW ^^.M*.t^oo.^^...X  s 
-D:   ~~~  XXX>XXH~G..#####~G~~Gt..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE.^^H..SM.~^.oo....JX    
-D: ~~....~~ XXX$8w~.^####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W.^^.M*.~^^^o^O^..X    
-D: ~.#..#..~~ XXX8##t..##~#.G.t..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE.^^H..SM.~.^oo...^JX    
-D: ~.##.##..~   XXX###GG~~~*h~.^..XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3tttW#...EE.W.^^.M*.t.oo.^.^.XX    
-D: ~~.###..~~     X##.##~~G^~~~~i*^XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
-D: ~~...###.~  k  ~###X.G~~@Gh~x*~^..^i.zX8~i.~..h....zzzXiX..^$.T.t$......F.t..XX..^TTT*..M..Y....^.Y.^*.^..~....X.x..x~.<XX~.    
-D: ~.....####.....#####XXXx@@~i~.z..z.it,#**t..h..Gzh.zzX@.@Xd*t.~...*~.t......^X..T.^T*@*TXMM...^....^**@.^.x*...+..~....XX..~    
-D:    ~~.#$%#########....XXX~h~i.HH...h,i^X*.H..h.^G..WX@.E.^X**8..Y.~*8...Y...^+XXXXXXXXXXXMF...~....^.*..x.***..X..x..~XX...~~w  
-D:   ~~.#$$######.~   ~w  XXX$~.x..~G^..,i.,.~.h.^~~..zzX@.@Xd*......F**..~....^XbM..^~ZZZZXMM..*.....~^......*.XXXXXXXIXX.~~#~w   
-D: L  ~~xx########.~~       XXX$$.G#GX#.i,,^ih.^W.zG^zzzXiX.$.t88.~..^**F..T...tXX~~.^^ZZZZM~..**@~~.Y~..^#^..xXI&X8&..XX ~~~## w  
+D:X##$#########....     s   XXXTT....~.~#####w~###~~~~8....**.~E.&E ...M..xx.....x..ZZ...XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
+D:X#########...~   w      XXXTTTT....x~.H####  ###~~D....8**.~M~.E..M..MM...xh.h...ZZZZ.~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
+D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~~E&EE..~%M..h.x.E.xh.ZZ...X.,......~ ...G.~  s ~#  XX ~~    w   X   
+D:X######...~~  MM~  w XXX..XXX.MMMxx...G#####w  ~#~.~..&...**E.ME~....MM.~..i.....ZZZZ.~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
+D:X##.....~~        XXX.E=.XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM...M.h..i..x.x..ZZ...XTTTTX.,.,~........~.G~~..w . G~...G~X    
+D:X...~~~    K    XXX..EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
+D: ~~~   w      XXX..EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
+D: w  MMM.  w XXX.E.XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
+D:    MM.   XXX4EEXXXi.**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
+D:   s    XXXBXXXXX..**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
+D:      XXX.o..X.g***i.*.,.XX%XX######....~      ##~~~.....~......~.....~.......~......~....~..~~...~~....~.~Xo..x************X    
+D: k  XXX.E..o.XX8.****,.g..XXX..#........~~~~~~~~###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
+D:  XXX%S..E..ooX,*****,..,.X.....h........XXX~~~~~#~~   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
+D: XX%%%.mm.E..oXH**...*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
+D:  XXX%S..E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
+D:    XXX.E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
+D: s    XXX.o..X&..w~##..##~~~X~..........~.~~~.~~   w   ~~.~~~~..~~.....~~~....~~~**....~~~.....~~~*..~~XXXW ...M*.~.oo......X  s 
+D:   ~~~  XXX>XXH~G..#####~G~~G~..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE...H..SM.~..oo....JX    
+D: ~~....~~ XXX$8w~..####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W....M*.~...o.O...X    
+D: ~.#..#..~~ XXX8##~..##~#.G.~..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE...H..SM.~..oo....JX    
+D: ~.##.##..~   XXX###GG~~~*h~....XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3~~~W#...EE.W....M*.~.oo.....XX    
+D: ~~.###..~~     X##.##~~G.~~~~i*.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
+D: ~~...###.~  k  ~###X.G~~*Gh~x*~....i.zX8~i.~..h....zzzXiX...$.T.~$......F.~..XX...TTT*..M..Y......Y..*....~....X.x..x~.<XX~.    
+D: ~.....####.....#####XXXx**~i~.z..z.i~,#**~..h..Gzh.zzX*.*Xd*~.~...*~.~.......X..T..T***TXMM.........***...x*...+..~....XX..~    
+D:    ~~.#$%#########....XXX~h~i.HH...h,i.X*.H..h..G..WX*.E..X**8..Y.~*8...Y....+XXXXXXXXXXXMF...~......*..x.***..X..x..~XX...~~w  
+D:   ~~.#$$######.~   ~w  XXX$~.x..~G...,i.,.~.h..~~..zzX*.*Xd*......F**..~.....XbM...~ZZZZXMM..*.....~.......*.XXXXXXXIXX.~~#~w   
+D: L  ~~xx########.~~       XXX$$.G#GX#.i,,.ih..W.zG.zzzXiX.$.~88.~...**F..T...~XX~~...ZZZZM~..***~~.Y~...#...xXI&X8&..XX ~~~## w  
 D:     ~.########..~~        XXXXX~#X~X#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX   ~###~w  
 D:  ~~.#########..~ w    K   w     ~#####    w  ~.M.~                    ~..####.~  s~~~~.~~              s  K            ~##..~   
 D:  ~..#########.~                  ~#####      ~...~             k     ~..###.~    ~~####~~~          w            w    ~###..~   
diff --git a/lib/edit/set_info.txt b/lib/edit/set_info.txt
index f114b7ef..c803d79f 100644
--- a/lib/edit/set_info.txt
+++ b/lib/edit/set_info.txt
@@ -18,10 +18,13 @@ N:0:Elven Gifts
 D:It is from a group of Elven items once entrusted to Hobbits
 # Phial of Galadriel
 P:1:2:1
-F:WIS | CHR | RES_DARK
+F:CHR
+F:RES_DARK
+F:WIS
 # Sting
 P:88:2:2
-F:STEALTH | REGEN
+F:REGEN
+F:STEALTH
 
 
 # The Dragon Slayer
@@ -30,7 +33,9 @@ N:1:Dragon Slayer
 D:It is from a group of items rumoured to be the bane of dragons.
 # Bow of bard
 P:125:2:3
-F:DEX | CON | RES_FIRE
+F:CON
+F:DEX
+F:RES_FIRE
 # Arrow of Bard
 P:63:2:5
 F:SPEED
@@ -44,17 +49,22 @@ D:It is one of the 3 legendary daggers.
 P:66:2:2
 F:STR
 P:66:3:1
-F:KILL_DRAGON | REGEN | SH_FIRE
+F:KILL_DRAGON
+F:REGEN
+F:SH_FIRE
 # Nimthanc
 P:67:2:2
 F:CON
 P:67:3:1
-F:KILL_DEMON | IM_COLD
+F:IM_COLD
+F:KILL_DEMON
 # Dethanc
 P:68:2:2
 F:DEX
 P:68:3:1
-F:KILL_UNDEAD | SH_ELEC | FLY
+F:FLY
+F:KILL_UNDEAD
+F:SH_ELEC
 
 
 # Gothmog's Armoury -- Demonologists set
@@ -64,10 +74,17 @@ D:It is from a group of items that once belonged to Gothmog,
 D:the High Captain of the Balrogs
 # The demonblade of Gothmog
 P:181:3:7
-F:STR | CON | SPEED | VAMPIRIC
+F:CON
+F:SPEED
+F:STR
+F:VAMPIRIC
 # The demonshield of Gothmog
 P:182:3:0
-F:IM_FIRE | IM_COLD | SH_ELEC
+F:IM_COLD
+F:IM_FIRE
+F:SH_ELEC
 # The demonhorn of Gothmog
 P:183:3:0
-F:ESP_EVIL | ESP_GOOD | AUTO_ID
+F:AUTO_ID
+F:ESP_EVIL
+F:ESP_GOOD
diff --git a/lib/edit/special.txt b/lib/edit/special.txt
index 8d1c94b9..4ac3f0ac 100644
--- a/lib/edit/special.txt
+++ b/lib/edit/special.txt
@@ -48,20 +48,17 @@ F:I:189:0
 # Treasure (random) on normal floor
 F:*:1:0:0:*
 
-# Trap (random) on normal floor
-F:^:1:0:0:0:0:0:*
-
 # down staircase
 F:>:7:0
 
 # between gates
-F:4:160:0:0:0:0:0:0:-1
-F:5:160:0:0:0:0:0:0:-1
-F:6:160:0:0:0:0:0:0:-1
-F:7:160:0:0:0:0:0:0:-1
-F:A:160:0:0:0:0:0:0:-1
-F:B:160:0:0:0:0:0:0:-1
-F:C:160:0:0:0:0:0:0:-1
-F:E:160:0:0:0:0:0:0:-1
-F:F:160:0:0:0:0:0:0:-1
-F:0:160:0:0:0:0:0:0:-1
+F:4:160:0:0:0:0:0:-1
+F:5:160:0:0:0:0:0:-1
+F:6:160:0:0:0:0:0:-1
+F:7:160:0:0:0:0:0:-1
+F:A:160:0:0:0:0:0:-1
+F:B:160:0:0:0:0:0:-1
+F:C:160:0:0:0:0:0:-1
+F:E:160:0:0:0:0:0:-1
+F:F:160:0:0:0:0:0:-1
+F:0:160:0:0:0:0:0:-1
diff --git a/lib/edit/spiders.map b/lib/edit/spiders.map
index 146c152c..f473cc31 100644
--- a/lib/edit/spiders.map
+++ b/lib/edit/spiders.map
@@ -20,10 +20,10 @@ F:b:89:3:275
 F:c:89:3:277
 
 # Grass with Aranea
-F:d:89:3:963:0:0:0:0:0:0:2
+F:d:89:3:963:0:0:0:0:0:2
 
 # Grass with Elder aranea
-F:e:89:3:964:0:0:0:0:0:0:2
+F:e:89:3:964:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt
index d0defd31..b5ae29cf 100644
--- a/lib/edit/st_info.txt
+++ b/lib/edit/st_info.txt
@@ -165,7 +165,6 @@ I:100:Monster Confusion
 I:100:Magic Mapping
 I:100:Treasure Detection
 I:100:Object Detection
-I:100:Trap Detection
 I:100:Detect Invisible
 I:100:Recharging
 I:100:Satisfy Hunger
@@ -224,7 +223,6 @@ I:100:Lightning Resistance
 I:100:Searching
 I:100:Cure Light Wounds
 # Rods
-I:100:Probing
 I:25:& Wooden Rod~ of#
 # Book
 T:100:111:50
@@ -252,7 +250,8 @@ N:6:Black Market
 A:30:0:1:2:3:4
 O:38:39:40:41
 G:7:D
-F:ALL_ITEM | MEDIUM_LEVEL
+F:ALL_ITEM
+F:MEDIUM_LEVEL
 W:24
 
 N:7:Home
@@ -336,7 +335,7 @@ G:+:s
 W:0
 
 N:16:Beastmaster Shanty
-A:18:0:21:22:0:0
+A:0:0:21:22:0:0
 O:19:19:19:19
 G:+:g
 W:0
@@ -479,7 +478,8 @@ T:100:24:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:39:Hafted Smith
@@ -487,7 +487,8 @@ T:100:21:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:40:Polearm Smith
@@ -495,7 +496,8 @@ T:100:22:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:41:Sword Smith
@@ -503,7 +505,8 @@ T:100:23:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:42:Rare Jewelry Shop
@@ -512,7 +515,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL | FORCE_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:10
 
@@ -522,7 +528,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL | FORCE_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:20
 
@@ -531,8 +540,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:r
-F:RANDOM | MEDIUM_LEVEL
 F:COMMON
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:45:Rare Footwear Shop
@@ -540,7 +550,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:r
-F:RANDOM | DEEP_LEVEL | MEDIUM_LEVEL
+F:DEEP_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:8
 
@@ -564,7 +576,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:8:9:10:11
 G:9:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:24
 
 N:47:Forbidden Library
@@ -587,7 +601,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:8:9:10:11
 G:9:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:RARE
 W:12
 
@@ -595,7 +611,11 @@ N:48:Expensive Black Market
 A:0:0:1:2:3:4
 O:38:39:40:41
 G:7:v
-F:RANDOM | ALL_ITEM | DEEP_LEVEL | DEPEND_LEVEL | MEDIUM_LEVEL
+F:ALL_ITEM
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:49:Common Shop
@@ -623,7 +643,9 @@ T:100:38:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:v
-F:RANDOM | DEEP_LEVEL | DEPEND_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:12
 
@@ -632,7 +654,9 @@ T:100:45:31
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:G
-F:RANDOM | SHALLOW_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
+F:SHALLOW_LEVEL
 F:VERY_RARE
 W:6
 
@@ -641,7 +665,9 @@ T:100:70:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:53:Potion Store
@@ -650,7 +676,9 @@ T:100:72:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:54:Recaller
@@ -658,7 +686,8 @@ I:100:Word of Recall
 A:33:0:1:2:3:0
 O:8:9:10:11
 G:+:b
-F:RANDOM | COMMON
+F:COMMON
+F:RANDOM
 W:2
 
 N:55:Master Archer
@@ -673,7 +702,9 @@ T:50:18:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:g
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:24
 
diff --git a/lib/edit/t_bree.txt b/lib/edit/t_bree.txt
index 3ea29922..3d19b888 100644
--- a/lib/edit/t_bree.txt
+++ b/lib/edit/t_bree.txt
@@ -5,7 +5,7 @@
 ############### Additional default terrain settings ###############
 
 # Default for Quest 1 = entrance is quest entrance
-F:z:8:3:0:0:0:0:0:4
+F:z:8:3:0:0:0:0:4
 
 # Default for Quest 18 = entrance is tree
 F:y:96:3
@@ -15,37 +15,37 @@ F:x:96:3
 
 ############### Quest 4 - Thieves Hideout finished = house ###############
 ?:[EQU $QUEST4 2]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:[EQU $QUEST4 5]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:1
 
 ############### Quest 8 - Troll Glade ###############
 ?:[AND [EQU $QUEST8 1] [EQU $DAYTIME 0] ]
-F:y:8:3:0:0:0:0:0:8
+F:y:8:3:0:0:0:0:8
 ?:1
 
 ############### Quest 9 - Wights Grave ###############
 ?:[EQU $QUEST9 1]
-F:x:8:3:0:0:0:0:0:9
+F:x:8:3:0:0:0:0:9
 ?:1
 
 ###### Additionnal buildings #######
 
 # Castle: Plot Bree
-F:B:75:3:0:0:0:0:0:1
+F:B:75:3:0:0:0:0:1
 
 # Mayor's house
-F:b:74:3:0:0:0:0:0:10
+F:b:74:3:0:0:0:0:10
 
 # The Prancing Pony
-F:a:74:3:0:0:0:0:0:58
+F:a:74:3:0:0:0:0:58
 
 # Soothsayer
-F:c:74:3:0:0:0:0:0:12
+F:c:74:3:0:0:0:0:12
 
 # The Mathom-house
-F:e:74:3:0:0:0:0:0:57
+F:e:74:3:0:0:0:0:57
 
 ############### Town Layout ###############
 
diff --git a/lib/edit/t_gondol.txt b/lib/edit/t_gondol.txt
index 51cf4b39..63f78d6c 100644
--- a/lib/edit/t_gondol.txt
+++ b/lib/edit/t_gondol.txt
@@ -15,7 +15,7 @@ F:y:1:3
 F:x:1:3
 
 # Default for Quest 23 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:23
+F:w:8:3:0:0:0:0:23
 
 # Decoration = Straight Road (B)
 F:":66:3
@@ -33,7 +33,7 @@ F:Z:63:3
 
 # Quest 13 assigned, entrance is quest entrance
 ?:[EQU $QUEST13 1]
-F:z:8:3:0:0:0:0:0:13
+F:z:8:3:0:0:0:0:13
 
 ?:1
 
@@ -41,11 +41,11 @@ F:z:8:3:0:0:0:0:0:13
 
 # Quest 14 assigned, entrance is quest entrance
 ?:[EQU $QUEST14 1]
-F:y:8:3:0:0:0:0:0:14
+F:y:8:3:0:0:0:0:14
 
 # Quest 14 finished, reward is a rare jewelry shop
 ?:[EQU $QUEST14 5]
-F:!:74:3:0:0:0:0:0:42
+F:!:74:3:0:0:0:0:42
 
 ?:1
 
@@ -53,7 +53,7 @@ F:!:74:3:0:0:0:0:0:42
 
 # Quest 15 assigned, entrance is quest entrance
 ?:[EQU $QUEST15 1]
-F:x:8:3:0:0:0:0:0:15
+F:x:8:3:0:0:0:0:15
 
 ?:1
 
@@ -61,15 +61,15 @@ F:x:8:3:0:0:0:0:0:15
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:1
+F:Z:176:3:0:0:0:0:1
 
 ?:1
 
 ############### Quest 23 - Wolves hut finished = house ###############
 ?:[EQU $QUEST23 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST23 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
@@ -82,46 +82,46 @@ F:w:74:3:0:0:0:0:0:7
 # m: White (Paladin)
 
 # Tower of the King
-F:a:74:3:0:0:0:0:0:27
+F:a:74:3:0:0:0:0:27
 
 # Library
-F:b:74:3:0:0:0:0:0:28
+F:b:74:3:0:0:0:0:28
 
 # Castle: Gondolin Plot
-F:B:75:3:0:0:0:0:0:4
+F:B:75:3:0:0:0:0:4
 
 # The White Tree:Aerandir:High-Elf
-F:c:74:3:0:0:0:0:0:29
+F:c:74:3:0:0:0:0:29
 
 # Craftsmaster
-F:d:74:3:0:0:0:0:0:30
+F:d:74:3:0:0:0:0:30
 
 # Earth-Dome
-F:e:74:3:0:0:0:0:0:31
+F:e:74:3:0:0:0:0:31
 
 # Prophet
-F:f:74:3:0:0:0:0:0:12
+F:f:74:3:0:0:0:0:12
 
 # Minstrels Haven
-F:h:74:3:0:0:0:0:0:32
+F:h:74:3:0:0:0:0:32
 
 # Star-Dome:Sulraen:High-Elf
-F:i:74:3:0:0:0:0:0:33
+F:i:74:3:0:0:0:0:33
 
 # Valarin Temple
-F:j:74:3:0:0:0:0:0:34
+F:j:74:3:0:0:0:0:34
 
 # Sea-Dome
-F:k:74:3:0:0:0:0:0:35
+F:k:74:3:0:0:0:0:35
 
 # The Golden Flower
-F:l:74:3:0:0:0:0:0:36
+F:l:74:3:0:0:0:0:36
 
 # The Fountain
-F:m:74:3:0:0:0:0:0:37
+F:m:74:3:0:0:0:0:37
 
 # Thunderlord's Hide
-F:n:74:3:0:0:0:0:0:22
+F:n:74:3:0:0:0:0:22
 
 # Force elven monsters
 f:ELVEN
diff --git a/lib/edit/t_khazad.txt b/lib/edit/t_khazad.txt
index 0139fa40..d2d6b6ac 100644
--- a/lib/edit/t_khazad.txt
+++ b/lib/edit/t_khazad.txt
@@ -8,28 +8,28 @@ F:o:207:3
 ###################### Buildings ########################
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Paladins Guild
-F:g:74:3:0:0:0:0:0:20
+F:g:74:3:0:0:0:0:20
 
 # Inner Temple
-F:h:74:3:0:0:0:0:0:19
+F:h:74:3:0:0:0:0:19
 
 # Mining Supplies
-F:i:74:3:0:0:0:0:0:59
+F:i:74:3:0:0:0:0:59
 
 # Default for Quest 25 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:25
+F:w:8:3:0:0:0:0:25
 
 # Force dwarven monsters
 f:DWARVEN
 
 ############### Quest 25 - Evil cave finished = house ###############
 ?:[EQU $QUEST25 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST25 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 # Town Layout
diff --git a/lib/edit/t_lorien.txt b/lib/edit/t_lorien.txt
index 9c8c8ad3..b8ecaac4 100644
--- a/lib/edit/t_lorien.txt
+++ b/lib/edit/t_lorien.txt
@@ -16,63 +16,63 @@ F:x:96:3
 F:v:88:3
 
 # Default for Quest 22 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:22
+F:w:8:3:0:0:0:0:22
 
 ############### Quest 22 - Wolves hut finished = house ###############
 ?:[EQU $QUEST22 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST22 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 ############### Entrance to the Void ###############
 ?:[EQU $QUEST20 1]
-F:v:7:3:0:0:0:0:0:11
+F:v:7:3:0:0:0:0:11
 ?:1
 
 ############### Quest 10 - Spiders of Mirkwood ###############
 # Quest 10 taken, entrance is quest entrance
 ?:[EQU $QUEST10 1]
-F:y:8:3:0:0:0:0:0:10
+F:y:8:3:0:0:0:0:10
 ?:1
 
 ############### Quest - Mage/Fireroof quest ###############
 # Mage/Fireproof Quest taken, entrance is quest entrance
 ?:[EQU $QUEST"Old Mages quest" 1]
-F:z:8:3:0:0:0:0:0:"Old Mages quest"
+F:z:8:3:0:0:0:0:"Old Mages quest"
 ?:1
 
 ###################### Buildings ########################
 
 # The Mirror
-F:a:74:3:0:0:0:0:0:23
+F:a:74:3:0:0:0:0:23
 
 # Castle: Plot Lorien
-F:B:75:3:0:0:0:0:0:2
+F:B:75:3:0:0:0:0:2
 
 # Seat of Ruling
-F:b:74:3:0:0:0:0:0:24
+F:b:74:3:0:0:0:0:24
 
 # Inn
-F:c:74:3:0:0:0:0:0:11
+F:c:74:3:0:0:0:0:11
 
 # Beastmaster Shanty
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Wizards Spire
-F:g:74:3:0:0:0:0:0:25
+F:g:74:3:0:0:0:0:25
 
 # Priests Circle
-F:h:74:3:0:0:0:0:0:26
+F:h:74:3:0:0:0:0:26
 
 # Rangers Guild allows Ranger
-F:i:74:3:0:0:0:0:0:21
+F:i:74:3:0:0:0:0:21
 
 # Nest
-F:j:74:3:0:0:0:0:0:22
+F:j:74:3:0:0:0:0:22
 
 # Altars
 F:k:161:3
diff --git a/lib/edit/t_minas.txt b/lib/edit/t_minas.txt
index 9f6ae669..b6e78672 100644
--- a/lib/edit/t_minas.txt
+++ b/lib/edit/t_minas.txt
@@ -9,66 +9,66 @@
 F:Z:63:3
 
 # Default for Quest 24 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:24
+F:w:8:3:0:0:0:0:24
 
 #################### Quest 16 - The last Alliance ####################
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:0
+F:Z:176:3:0:0:0:0:0
 
 ?:1
 
 ############### Quest 24 - Haunted House finished = house ###############
 ?:[EQU $QUEST24 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST24 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
 
 # Library
-F:a:74:3:0:0:0:0:0:60
+F:a:74:3:0:0:0:0:60
 
 # Castle
-F:b:74:3:0:0:0:0:0:14
+F:b:74:3:0:0:0:0:14
 
 # Casino
-F:d:74:3:0:0:0:0:0:15
+F:d:74:3:0:0:0:0:15
 
 # Inn
-F:e:74:3:0:0:0:0:0:11
+F:e:74:3:0:0:0:0:11
 
 # Beastmaster Shanty
-F:f:74:3:0:0:0:0:0:16
+F:f:74:3:0:0:0:0:16
 
 # Fighters hall
-F:g:74:3:0:0:0:0:0:17
+F:g:74:3:0:0:0:0:17
 
 # Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
 
 # Inner temple
-F:i:74:3:0:0:0:0:0:19
+F:i:74:3:0:0:0:0:19
 
 # Paladin guild
-F:j:74:3:0:0:0:0:0:20
+F:j:74:3:0:0:0:0:20
 
 # Ranger guild
-F:k:74:3:0:0:0:0:0:21
+F:k:74:3:0:0:0:0:21
 
 # Thunderlord's Hide
-F:l:74:3:0:0:0:0:0:22
+F:l:74:3:0:0:0:0:22
 
 # Castle: Plot Minas Anor
-F:B:75:3:0:0:0:0:0:5
+F:B:75:3:0:0:0:0:5
 
 # Library Quest
 F:x:63:3
 
 ?:[EQU $QUEST"Library quest" 1]
-F:x:8:3:0:0:0:0:0:"Library quest"
+F:x:8:3:0:0:0:0:"Library quest"
 ?:1
 
 ############### Town Layout ###############
diff --git a/lib/edit/t_pref.txt b/lib/edit/t_pref.txt
index 84ff947d..454d6a00 100644
--- a/lib/edit/t_pref.txt
+++ b/lib/edit/t_pref.txt
@@ -1,19 +1,19 @@
 # File: t_pref.txt
 
 # Defines the preferences for the town features
-# letter:feature:cave_info:monster:object:ego:artifact:trap:special
+# letter:feature:cave_info:monster:object:ego:artifact:special
 
 # Barrow-Downs entrance
-F:{:7:3:0:0:0:0:0:4
+F:{:7:3:0:0:0:0:4
 
 # Mirkwood Forest entrance
-F:~:7:3:0:0:0:0:0:1
+F:~:7:3:0:0:0:0:1
 
 # Land of Mordor entrance
-F:|:7:3:0:0:0:0:0:2
+F:|:7:3:0:0:0:0:2
 
 # Angband Dungeon entrance
-F:>:7:3:0:0:0:0:0:3
+F:>:7:3:0:0:0:0:3
 
 # Mountain chain
 F:^:97:3
@@ -72,34 +72,34 @@ F:Y:192:3
 F:O:200:3
 
 # General Store
-F:1:74:3:0:0:0:0:0:0
+F:1:74:3:0:0:0:0:0
 
 # Armoury
-F:2:74:3:0:0:0:0:0:1
+F:2:74:3:0:0:0:0:1
 
 # Weapons Smith
-F:3:74:3:0:0:0:0:0:2
+F:3:74:3:0:0:0:0:2
 
 # Temple
-F:4:74:3:0:0:0:0:0:3
+F:4:74:3:0:0:0:0:3
 
 # Alchemy Shop
-F:5:74:3:0:0:0:0:0:4
+F:5:74:3:0:0:0:0:4
 
 # Magic Shop
-F:6:74:3:0:0:0:0:0:5
+F:6:74:3:0:0:0:0:5
 
 # Black Market
-F:7:74:3:0:0:0:0:0:6
+F:7:74:3:0:0:0:0:6
 
 # Home
-F:8:74:3:0:0:0:0:0:7
+F:8:74:3:0:0:0:0:7
 
 # Bookstore
-F:9:74:3:0:0:0:0:0:8
+F:9:74:3:0:0:0:0:8
 
 # Pet Shop
-F:0:74:3:0:0:0:0:0:9
+F:0:74:3:0:0:0:0:9
 
 # Underground Tunnels -- used for tunnels in towns
 F:I:173:3
diff --git a/lib/edit/thieves.map b/lib/edit/thieves.map
index a2cdb442..bab5721e 100644
--- a/lib/edit/thieves.map
+++ b/lib/edit/thieves.map
@@ -23,19 +23,19 @@ F:d:4:6
 F:<:6:8
 
 # Floor with Novice rogue
-F:a:1:6:44:0:0:0:0:0:0:2
+F:a:1:6:44:0:0:0:0:0:2
 
 # Floor with Bandit
-F:b:1:6:150:43:*:0:0:0:0:2
+F:b:1:6:150:43:*:0:0:0:2
 
 # Floor with novice warrior
-F:c:1:6:43:0:0:0:0:0:0:2
+F:c:1:6:43:0:0:0:0:0:2
 
 # Floor with novice mage
-F:e:1:6:46:0:0:0:0:0:0:2
+F:e:1:6:46:0:0:0:0:0:2
 
 # Dark floor with novice warrior
-F:f:1:4:43:0:0:0:0:0:0:2
+F:f:1:4:43:0:0:0:0:0:2
 
 # Floor with human skeleton
 F:z:1:6:0:395
diff --git a/lib/edit/thrain.map b/lib/edit/thrain.map
index 8adc41be..7c60a839 100644
--- a/lib/edit/thrain.map
+++ b/lib/edit/thrain.map
@@ -1,25 +1,22 @@
 # Floor
-F:.:1:0:0:0:0:0:0:0:61
+F:.:1:0:0:0:0:0:0:61
 
 # Some Nazguls
-F:1:1:0:951:0:0:0:0:0:61:2
-F:2:1:0:952:0:0:0:0:0:61:2
-F:o:1:0:866:0:0:0:0:0:61
+F:1:1:0:951:0:0:0:0:61:2
+F:2:1:0:952:0:0:0:0:61:2
+F:o:1:0:866:0:0:0:0:61
 
 # Marker
-F:,:172:6:0:0:0:0:0:0:61
+F:,:172:6:0:0:0:0:0:61
 
 # Lit permanent wall
 F:x:61:6
 
 # Door
-F:D:48:0:0:0:0:0:0:0:61
-
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
+F:D:48:0:0:0:0:0:0:61
 
 # Deep lava
-F:l:85:0:0:0:0:0:0:0:61
+F:l:85:0:0:0:0:0:0:61
 
 # Dungeon layout
 D:          
diff --git a/lib/edit/tr_info.txt b/lib/edit/tr_info.txt
deleted file mode 100644
index 0643f1ab..00000000
--- a/lib/edit/tr_info.txt
+++ /dev/null
@@ -1,815 +0,0 @@
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-#
-#  byte type;            /* this goes into sval */
-#  s16b probability;     /* probability of existence in 1000 */
-#  s16b another;         /* does this trap easily combine in 1000 */
-#  s16b pvalinc;         /* how much does this trap attribute to pval */
-#  byte difficulty;      /* how difficult to disarm */
-#  byte level;           /* minimum level - disenchantment trap at 200' is */
-#                        /* not so nice */
-#  byte color;
-#  cptr name;            /* what name does this trap have */
-#
-#  d TERM_DARK  |r TERM_RED  |D TERM_L_DARK |R TERM_L_RED
-#  w TERM_WHITE |g TERM_GREEN|W TERM_L_WHITE|G TERM_L_GREEN
-#  s TERM_SLATE |b TERM_BLUE |v TERM_VIOLET |B TERM_L_BLUE
-#  o TERM_ORANGE|u TERM_UMBER|y TERM_YELLOW |U TERM_L_UMBER
-#
-# b blue   for stat traps
-# w white  for teleport traps
-# o orange for dungeon rearrangement traps
-# v violet for summoning traps
-# y yellow for stealing/equipment traps
-# r red    for other character affecting traps
-# g green  for elemental bolt trap
-# B umber  for elemental ball trap
-# R l red  for arrow/dagger traps
-# W        for compound trap!!!
-# don't use U or you'll get trapped doors that are indistinguishable from untrapped doors!
-#
-#  an unknown character is multi-hued!
-#
-# N:type:name
-# I:diff:prob:another:pval:minlevel:damage:color
-# I:diff:prob:            :minlevel:      :color
-# D:description
-
-#
-# stat traps
-#
-
-N:1:Weakness Trap
-I:2:100:5:5:2:0d0:b
-D:A poisoned needle weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:2:Weakness Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle seriously weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:3:Weakness Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle permanently weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:4:Intelligence Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel stupid!
-F:FLOOR | CHEST | DOOR
-
-N:5:Intelligence Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very stupid!
-F:FLOOR | CHEST | DOOR
-
-N:6:Intelligence Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently stupid!
-F:FLOOR | CHEST | DOOR
-
-N:7:Wisdom Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel naive!
-F:FLOOR | CHEST | DOOR
-
-N:8:Wisdom Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very naive!
-F:FLOOR | CHEST | DOOR
-
-N:9:Wisdom Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently naive!
-F:FLOOR | CHEST | DOOR
-
-N:10:Fumbling Fingers Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:11:Fumbling Fingers Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:12:Fumbling Fingers Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:13:Wasting Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel sickly!
-F:FLOOR | CHEST | DOOR
-
-N:14:Wasting Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very sickly!
-F:FLOOR | CHEST | DOOR
-
-N:15:Wasting Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently sickly!
-F:FLOOR | CHEST | DOOR
-
-N:16:Beauty Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle scars you!
-F:FLOOR | CHEST | DOOR
-
-N:17:Beauty Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle scars you horribly!
-F:FLOOR | CHEST | DOOR
-
-N:18:Beauty Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle scars you permanently!
-F:FLOOR | CHEST | DOOR
-
-#
-# miscellaneous traps
-#
-
-N:20:Trap of Curse Weapon
-I:5:10:0:12:20:0d0:y
-D:Your weapon will never be the same...
-F:FLOOR | CHEST | DOOR
-
-N:21:Trap of Curse Armour
-I:5:15:0:12:20:0d0:y
-D:Your armour doesn't exactly get better by setting off this trap...
-F:FLOOR | CHEST | DOOR
-
-N:22:Earthquake Trap
-I:5:20:0:10:10:0d0:o
-D:The ceiling collapses around you!
-F:FLOOR | CHEST | DOOR
-
-N:23:Poison Needle Trap
-I:1:50:50:3:2:0d0:r
-D:A poisoned needle pricks you!
-F:FLOOR | CHEST | DOOR
-
-N:24:Summon Monster Trap
-I:2:50:40:4:2:0d0:v
-D:Monsters defend the memory of the owner...
-F:FLOOR | CHEST | DOOR
-
-N:25:Summon Undead Trap
-I:4:25:40:6:10:0d0:v
-D:Undead rise from the grave to defend this!
-F:FLOOR | CHEST | DOOR
-
-N:26:Summon Greater Undead Trap
-I:8:10:50:20:20:0d0:v
-D:Greater undead defend this!
-F:FLOOR | CHEST | DOOR
-
-N:27:Teleport Trap
-I:3:100:50:3:2:0d0:w
-D:Now you know why nobody ever got close enough to disarm this trap...
-F:FLOOR | CHEST | DOOR
-
-N:28:Paralysing Trap
-I:1:100:20:2:2:0d0:r
-D:You suddenly cannot move!
-F:FLOOR | CHEST | DOOR
-
-N:29:Explosive Device
-I:3:100:80:0:3:3d8:r
-D:Ha! It explodes before your hands can illegally touch it!
-F:FLOOR | CHEST | DOOR
-
-N:30:Teleport Item Trap
-I:3:50:50:3:5:0d0:w
-D:The item magically disappears from your greedy hands!
-F:FLOOR | CHEST
-
-N:31:Lose Memory Trap
-I:6:30:30:6:10:0d0:r
-D:You suddenly can't remember what you were doing here...
-F:FLOOR | CHEST | DOOR
-
-N:32:Bitter Regret Trap
-I:9:15:20:9:20:0d0:r
-D:You already regret trying this...
-F:FLOOR | CHEST | DOOR
-
-N:33:Bowel Cramps Trap
-I:1:90:20:1:6:0d0:r
-D:Your stomach twists with a sharp pang!
-F:FLOOR | CHEST | DOOR
-
-N:34:Blindness/Confusion Trap
-I:4:100:50:4:6:0d0:r
-D:You suddenly can't see, and thinking is difficult too....
-F:FLOOR | CHEST | DOOR
-
-N:35:Aggravation Trap
-I:2:100:50:2:3:0d0:o
-D:Your hear a high-pitched humming noise...
-F:FLOOR | CHEST | DOOR
-
-N:36:Multiplication Trap
-I:3:90:0:3:5:0d0:o
-D:The floor around you doesn't seem the same...
-F:FLOOR | CHEST | DOOR
-
-N:37:Steal Item Trap
-I:3:100:50:3:6:0d0:y
-D:The chest seems to swell, while your backpack feels lighter..
-F:FLOOR | CHEST
-
-N:38:Summon Fast Quylthulgs Trap
-I:8:50:10:10:25:0d0:v
-D:Parts of the owner seem to return from somewhere else, as you slow in awe.
-F:FLOOR | CHEST | DOOR
-
-N:39:Trap of Sinking
-I:2:50:0:0:3:0d0:w
-D:A trapdoor opens up under you!
-F:FLOOR | DOOR
-
-N:40:Trap of Mana Drain
-I:4:100:50:3:4:0d0:r
-D:You suddenly can't think so clearly any more...
-F:FLOOR | CHEST | DOOR
-
-N:41:Trap of Missing Money
-I:2:100:50:2:2:0d0:y
-D:Money isn't everything, they say...
-F:FLOOR | CHEST | DOOR
-
-N:42:Trap of No Return
-I:5:20:10:4:8:0d0:y
-D:Do stay a while!
-F:FLOOR | CHEST | DOOR
-
-N:43:Trap of Silent Switching
-I:4:100:50:3:6:0d0:y
-D:You suddenly are a different person!
-F:FLOOR | CHEST | DOOR
-
-N:44:Trap of Walls
-I:6:100:50:2:10:0d0:o
-D:The room seems to shrink!
-F:FLOOR | CHEST | DOOR
-
-N:45:Trap of Calling Out
-I:10:100:100:5:15:0d0:v
-D:You hear something coming closer, much closer.
-F:FLOOR | CHEST | DOOR
-
-N:46:Trap of Sliding
-I:8:50:50:4:8:0d0:r
-D:Your feet seem to have a life of their own!
-F:FLOOR | CHEST | DOOR
-
-N:47:Trap of Charges Drain
-I:6:100:70:2:3:0d0:y
-D:You feel as if you've just lost something...
-F:FLOOR | CHEST | DOOR
-
-N:48:Trap of Stair Movement
-I:6:0:50:3:4:0d0:o
-D:The dungeon seems different...
-F:FLOOR | CHEST | DOOR
-
-N:49:Trap of New Trap
-I:5:100:5:0:4:0d0:o
-D:Somehow, disarming isn't over, you feel...
-F:FLOOR | CHEST | DOOR
-
-N:50:Trap of Scatter Items
-I:10:50:50:6:12:0d0:w
-D:You hear crashing sounds from all over the dungeon!
-F:FLOOR | CHEST | DOOR
-
-N:51:Trap of Decay
-I:4:100:50:4:4:0d0:r
-D:Your stomach isn't empty, but suddenly you think of food.
-F:FLOOR | CHEST | DOOR
-
-N:52:Trap of Wasting Wands
-I:6:100:40:4:5:0d0:y
-D:Your wands seem different...
-F:FLOOR | CHEST | DOOR
-
-N:53:Trap of Filling
-I:10:100:0:10:25:0d0:o
-D:The whole room vibrates in a strange way...
-F:FLOOR | CHEST | DOOR
-
-N:54:Trap of Drain Speed
-I:8:50:10:25:80:0d0:y
-D:You suddenly seem to have more time to self-reflect...
-F:FLOOR | CHEST | DOOR
-
-#
-# bolt traps
-#
-
-N:60:Lightning Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:61:Poison Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A blast of poison gas hits you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:62:Acid Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A jet of acid shoots out at you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:63:Cold Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:64:Fire Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:65:Plasma Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of plasma hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:66:Water Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A gush of water hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:67:Light Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:There is a sudden flash of light around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:68:Dark Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of pure elemental darkness hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:69:Shards Bolt Trap
-I:6:80:5:6:15:6d10:g
-D:A blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:70:Sound Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A sudden roar of sound hurts your eardrums!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:71:Confusion Bolt Trap
-I:4:80:5:5:8:6d10:g
-D:A blast of confusion gas engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:72:Force Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of pure force hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:73:Inertia Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your feet feel like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:74:Mana Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of pure magic hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:75:Ice Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of ice hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:76:Chaos Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A blast of raw chaos hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:77:Nether Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of negative energy hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:78:Disenchantment Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:There is a static feeling in the air...
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:79:Nexus Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:80:Time Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:Suddenly, several months pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:81:Gravity Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Gravity suddenly warps around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#
-# ball traps
-#
-
-N:82:Lightning Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A massive electrical charge shoots through you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:83:Poison Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A large cloud of poison gas envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:84:Acid Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly drenched in acid!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:85:Cold Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A blast of hideously cold air envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:86:Fire Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly in the centre of a raging inferno!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:87:Plasma Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You are engulfed in plasma!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:88:Water Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A whirlpool engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:89:Light Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive flash of light erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:90:Darkness Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A large patch of darkness erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:91:Shards Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:92:Sound Ball Trap
-I:8:60:5:8:20:12d18:B
-D:BOOM! Your eardrums nearly explode!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:93:Confusion Ball Trap
-I:5:60:5:6:15:8d12:B
-D:You are enveloped in a cloud of confusion gas!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:94:Force Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of pure force smashes down around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:95:Inertia Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Suddenly, your entire body feels like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:96:Mana Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:97:Ice Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive blast of ice crystals engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:98:Chaos Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of raw chaos engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:99:Nether Ball Trap
-I:10:60:5:10:30:16d20:g
-D:A blast of energy from the netherworld engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-# N:type:name
-# I:diff:prob:another:pval:minlevel:color
-# D:description
-
-N:100:Disenchantment Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure anti-magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:101:Nexus Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A ball of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:102:Time Ball Trap
-I:10:60:5:10:30:16d20:B
-D:Suddenly, several years pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:103:Gravity Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You suddenly feel gravity warp violently around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:110:Arrow Trap
-I:2:100:0:5:2:0d0:R
-D:An arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:111:Bolt Trap
-I:2:100:0:5:5:0d0:R
-D:A bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:112:Seeker Arrow Trap
-I:2:100:0:6:10:0d0:R
-D:A seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:113:Seeker Bolt Trap
-I:2:100:0:6:12:0d0:R
-D:A seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:114:Poison Arrow Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:115:Poison Bolt Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:116:Poison Seeker Arrow Trap
-I:2:100:0:7:12:0d0:R
-D:A poisoned seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:117:Poison Seeker Bolt Trap
-I:2:100:0:7:15:0d0:R
-D:A poisoned seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:118:Broken Dagger Trap
-I:2:100:0:5:2:0d0:R
-D:An broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:119:Dagger Trap
-I:2:100:0:5:5:0d0:R
-D:A dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:120:Poison Broken Dagger Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:121:Poison Dagger Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-#
-# multiple arrows/daggers traps
-#
-
-N:122:Arrows Trap
-I:4:100:0:7:16:0d0:R
-D:Some arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:123:Bolts Trap
-I:4:100:0:7:18:0d0:R
-D:Some bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:124:Seeker Arrow Trap
-I:5:100:0:8:20:0d0:R
-D:Some seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:125:Seeker Bolt Trap
-I:5:100:0:8:24:0d0:R
-D:Some seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:126:Poison Arrows Trap
-I:5:100:0:8:18:0d0:R
-D:Some poisoned arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:127:Poison Bolt Trap
-I:6:100:0:8:20:0d0:R
-D:Some poisoned bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:128:Poison Seeker Arrows Trap
-I:7:100:0:9:27:0d0:R
-D:Some poisoned seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:129:Poison Seeker Bolts Trap
-I:9:100:0:9:30:0d0:R
-D:Some poisoned seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:130:Broken Daggers Trap
-I:4:100:0:6:12:0d0:R
-D:Some broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:131:Dagger Trap
-I:4:100:0:6:15:0d0:R
-D:Some daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:132:Poison Broken Daggers Trap
-I:5:100:0:7:18:0d0:R
-D:Some poisoned broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:133:Poison Daggers Trap
-I:6:100:0:7:23:0d0:R
-D:Some poisoned daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:140:Trap of Drop Item
-I:3:50:0:2:5:0d0:y
-D:A sudden sound startles you and you drop something!
-F:FLOOR | CHEST | DOOR
-
-N:141:Trap of Drop Items
-I:5:50:0:5:12:0d0:y
-D:A sudden sound startles you and you drop several things!
-F:FLOOR | CHEST | DOOR
-
-N:142:Trap of Drop Everything
-I:8:50:0:8:20:0d0:y
-D:A sudden sound startles you and you drop everything!
-F:FLOOR | CHEST | DOOR
-
-#-SC-
-N:150:Trap of Femininity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman!
-F:FLOOR | CHEST | DOOR
-
-N:151:Trap of Masculinity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new man!
-F:FLOOR | CHEST | DOOR
-
-N:152:Trap of Neutrality
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman... erm, a new man... er, WHAT did you say???
-F:FLOOR | CHEST | DOOR
-
-N:153:Trap of Aging
-I:5:50:5:0:15:1d8:r
-D:You suddenly age very fast!
-F:CHEST | DOOR
-
-N:154:Trap of Growing
-I:3:75:5:0:5:1d8:r
-D:You begin to grow!
-F:FLOOR | CHEST | DOOR
-
-N:155:Trap of Shrinking
-I:3:75:5:0:5:1d8:r
-D:You begin to shrink!
-F:FLOOR | CHEST | DOOR
-
-#N:156: UNUSED
-
-#N:157: UNUSED
-
-N:158:Trap of Divine Anger
-I:6:100:5:0:15:0d0:G
-D:A voice booms out "Have a care, mortal!"
-F:FLOOR | CHEST | DOOR
-
-N:159:Trap of Divine Wrath
-I:9:50:5:0:30:0d0:G
-D:A voice booms out "Sacrilege!"
-F:FLOOR | CHEST | DOOR
-
-N:160:Hallucination Trap
-I:3:100:10:0:4:0d0:r
-D:Your vision is clouded by a blast of kaleidoscopic light!
-F:FLOOR | CHEST | DOOR
-
-# Bolt traps
-N:161:Greater Magic Missile Trap
-I:6:80:5:6:75:25d20:g
-D:A greater magic missile hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:162:Foulness Trap
-#I:6:80:5:6:15:10d12:g
-#D:You feel foul!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:163:Trap of Death Ray
-#I:8:80:5:9:25:15d16:g
-#D:A Ray of Death hits you!
-#F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:164:Trap of Holy Fire
-I:6:80:5:6:15:10d12:g
-D:Holy fire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:165:Trap of Hell Fire
-I:6:80:5:6:15:10d12:g
-D:Hellfire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:166:Psi Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your mind is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:167:Psi Drain Trap
-I:6:80:5:6:15:8d10:r
-D:You suddenly can't think clearly any more...
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Ball Traps
-
-### this one *ought* to be a Nuke Ball trap, not plasma ball, as trap 87 
-### is also plasma ball. I've put the description right in advance.
-
-#N:168:Plasma Ball Trap
-#I:8:60:5:8:20:12d18:B
-#D:A blast of radiation engulfs you!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:169:Psi Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Your brain is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Useful traps
-
-N:170:Acquirement Trap
-I:1:40:5:5:18:0d0:v
-D:Whoa!
-F:FLOOR | DOOR
-
-# More bolt traps
-
-N:171:Greater Lightning Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:172:Greater Poison Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A blast of deadly poison gas hits you! 
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:173:Greater Acid Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A jet of acid shoots out at you! It burns severely!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:174:Greater Cold Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:175:Greater Fire Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
diff --git a/lib/edit/trolls.map b/lib/edit/trolls.map
index e5d104fd..c54a5418 100644
--- a/lib/edit/trolls.map
+++ b/lib/edit/trolls.map
@@ -17,19 +17,19 @@ F:.:88:3
 F:;:89:3
 
 # Floor with forest troll
-F:f:89:3:297:0:0:0:0:0:0:2
+F:f:89:3:297:0:0:0:0:0:2
 
 # Floor with stone troll
-F:s:89:3:401:0:0:0:0:0:0:2
+F:s:89:3:401:0:0:0:0:0:2
 
 # Floor with algroth
-F:a:89:3:424:0:0:0:0:0:0:2
+F:a:89:3:424:0:0:0:0:0:2
 
 # Floor with Bert
-F:b:89:3:493:0:0:0:0:0:0:2
+F:b:89:3:493:0:0:0:0:0:2
 
 # Floor with Bill
-F:i:89:3:494:0:0:0:0:0:0:2
+F:i:89:3:494:0:0:0:0:0:2
 
 # Floor with a Dwarven skeleton
 F:k:89:8:0:396
diff --git a/lib/edit/v_info.txt b/lib/edit/v_info.txt
index 964f2b54..d5a92ee2 100644
--- a/lib/edit/v_info.txt
+++ b/lib/edit/v_info.txt
@@ -228,7 +228,7 @@ D:%........XXXXXXXXXXX.%
 D:%%%%%%%%%%%%%%%%%%%%%%
 
 N:12:Lesser vault (prison)
-X:7:10:16:35
+X:7:10:15:35
 D:%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 D:%.+..&..+..&..+..&..+..&..+..&..+.%
 D:%.###.#####.#####.#####.#####.###.%
diff --git a/lib/edit/volcano.txt b/lib/edit/volcano.txt
index 1b89cf3d..c7e64dee 100644
--- a/lib/edit/volcano.txt
+++ b/lib/edit/volcano.txt
@@ -1,10 +1,10 @@
 # File: volcano.txt
 
 # Stairway to the Hell
-F:$:7:3:0:0:0:0:0:6
+F:$:7:3:0:0:0:0:6
 
 # Hole to the center of the Volcano
-F:>:7:3:0:0:0:0:0:5
+F:>:7:3:0:0:0:0:5
 
 ############### Town Layout ###############
 
diff --git a/lib/edit/wights.map b/lib/edit/wights.map
index d35c20ee..9e2ea0ce 100644
--- a/lib/edit/wights.map
+++ b/lib/edit/wights.map
@@ -17,13 +17,13 @@ F:;:88:3
 F:f:88:3:381
 
 # Floor with grave wight
-F:g:88:3:470:0:0:0:0:0:0:2
+F:g:88:3:470:0:0:0:0:0:2
 
 # Floor with barrow wight
-F:b:88:3:499:0:0:0:0:0:0:2
+F:b:88:3:499:0:0:0:0:0:2
 
 # Floor with Emperor Wight
-F:e:88:3:604:0:0:0:0:0:0:2
+F:e:88:3:604:0:0:0:0:0:2
 
 # Floor with a Human Skeleton
 F:k:88:8:0:395
@@ -32,31 +32,31 @@ F:k:88:8:0:395
 F:,:172:6
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:2057
+F:1:160:6:0:0:0:0:2057
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:1036
+F:2:160:6:0:0:0:0:1036
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:3847
+F:3:160:6:0:0:0:0:3847
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:2321
+F:4:160:6:0:0:0:0:2321
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:1043
+F:5:160:6:0:0:0:0:1043
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:3599
+F:6:160:6:0:0:0:0:3599
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:2071
+F:7:160:6:0:0:0:0:2071
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:3350
+F:8:160:6:0:0:0:0:3350
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:771
+F:9:160:6:0:0:0:0:771
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXX