diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..2efc4925fa79ed659725290f4950ded1f746960c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,36 @@
+These config files make the First Blood RPG books look and act the way they do.
+
+# Usage
+
+To make a book, put this config folder into the same directory, and copy `main.tex` into the directory.
+
+Edit 'main.tex', and input your tex files by writing `\include{my_file.tex}.
+
+## Creatures
+
+You can include pseudo-randomo creatures in your adventure by summoning the names from monsters.tex.  For example, to place a random elf in your game, just write `\elf`, and an elf will be magically summoned unto your adventure.   You can give the character a title and name by writing '\character', or simply '\monster' for an animal, creature, or other non-intelligence character.  For example:
+
+```
+
+\character{Rincewind}
+
+\humanalchemist
+
+```
+
+This would make a heading called **Rincewind** in bold, and provide pseudo-random alchemist-appropriate stats underneath.
+
+For a complete list of all the creatures and characters which can be used, see the 'monsters.tex' file.  For more details on the syntax, have a look at examples in *Adventures in Fenestra*.
+
+# Texnical Details
+
+This thing's handled as a subtree in the other documments, so changing it will change all First Blood books.
+
+Personally, I keep it in a directory by the others.  This allows you to do:
+
+> git subtree -P config pull ../config master
+
+The configs also have one branch per repo, so when writing Adventures in Fenestra ('aif'), you can do a push to just that branch:
+
+> git subtree -P config push ../config aif
+
diff --git a/glossary.tex b/glossary.tex
index 94b8f72c5345e5a3a2c513f36be35ead7bc81dc4..8666bfe77d2f711fa50b05c6ef34f87cf0588d93 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -1,20 +1,35 @@
-\usepackage[indexonlyfirst]{glossaries}
-\setacronymstyle{long-short-desc}
 \makeglossaries
 
 \makeglossaries
 
 %%% Core Rules Terms
 
-\newglossaryentry{area}{name={Area},description={The basic unit of large spaces. An area is a space made distinct by its features. In a dungeon, each room might count as an area, while out in the open plains a forest might be composed of the local areas: `the centre with the big, felled tree; the river's fork; the priestess's house and the griffins' nesting site}}
-
-	\newglossaryentry{standingspell}{name={Standing Spell},description={A spell which stays put once cast for as long as the caster wants to maintain it},first={\textit{Standing Spell}}}
-
-	\newglossaryentry{quickaction}{name={Quick Action},description={An action which can skip the normal Initiative order but still costs Initiative.  Quick actions can even be performed when someone has a negative Initiative score},first={\textit{Quick Action}}}
-
-	\newglossaryentry{attribute}{name={Attribute},description={One of the six Traits which form the basis of the character -- Strength, Speed, et c}}
-
-	\newglossaryentry{character}{name={Character},description={Anyone in the game world, though `the characters' typically refers to the PCs}}
+\newglossaryentry{area}{
+	name={Area},
+	description={The basic unit of large spaces. An area is a space made distinct by its features. In a dungeon, each room might count as an area, while out in the open plains a forest might be composed of the local areas: `the centre with the big, felled tree; the river's fork; the priestess's house and the griffins' nesting site}
+	}
+
+	\newglossaryentry{standingspell}{
+		name={Standing Spell},
+		description={A spell which stays put once cast for as long as the caster wants to maintain it},
+		first={\textit{Standing Spell}}
+		}
+
+	\newglossaryentry{quickaction}{
+		name={Quick Action},
+		description={An action which can skip the normal Initiative order but still costs Initiative.  Quick actions can even be performed when someone has a negative Initiative score},
+		first={\textit{Quick Action}}
+		}
+
+	\newglossaryentry{attribute}{
+		name={Attribute},
+		description={One of the six Traits which form the basis of the character -- Strength, Speed, et c}
+		}
+
+	\newglossaryentry{character}{
+		name={Character},
+		description={Anyone in the game world, though `the characters' typically refers to the PCs}
+		}
 
 	\newacronym[description={The smallest unit of currency},shortplural={cp}]{cp}{cp}{Copper Piece}
 
@@ -22,11 +37,20 @@
 
 	\newacronym[description={-- the person running the game, playing all characters except the PCs, creating the story and making rulings. Everything rests in the hands of the GM}]{gm}{GM}{Games Master}
 
-	\newglossaryentry{downtime}{name={Downtime},description={This is any long period of time between adventures. It gives characters a chance to complete personal tasks and train in highly technical Skills}}
+	\newglossaryentry{downtime}{
+		name={Downtime},
+		description={This is any long period of time between adventures. It gives characters a chance to complete personal tasks and train in highly technical Skills}
+		}
 
-	\newglossaryentry{evasion}{name={The Evasion Factor},description={A rating of a character's ability to avoid Damage. The Evasion Factor is based on a character's Dexterity plus a bonus from their Weapon. The TN to hit any character is 7 plus their Evasion Factor}}
+	\newglossaryentry{evasion}{
+		name={The Evasion Factor},
+		description={A rating of a character's ability to avoid Damage. The Evasion Factor is based on a character's Dexterity plus a bonus from their Weapon. The TN to hit any character is 7 plus their Evasion Factor}
+		}
 
-	\newglossaryentry{strike}{name={The Strike Factor},description={A rating of a character's ability to hit people accurately. The Strike Factor is usually based on a character's Combat Skill}}
+	\newglossaryentry{strike}{
+		name={The Strike Factor},
+		description={A rating of a character's ability to hit people accurately. The Strike Factor is usually based on a character's Combat Skill}
+		}
 
 	\newacronym[description={A measure of how much luck the character has left, used solely to avoid Damage},shortplural={FP}]{fp}{FP}{Fate Point}
 
@@ -36,23 +60,42 @@
 
 	\newacronym[description={The ``battery power'' of a magic user, which allows them to power spells},shortplural={MP}]{mp}{MP}{Mana Point}
 
-	\newglossaryentry{init}{name={Initiative Factor},description={The bonus to the character's Initiative score, usually a combination of Speed + Weapon bonus + Combat Skill bonus}}
+	\newglossaryentry{init}{
+		name={Initiative Factor},
+		description={The bonus to the character's Initiative score, usually a combination of Speed + Weapon bonus + Combat Skill bonus}
+		}
 
-	\newglossaryentry{miracleworker}{name={Miracle Worker},text={miracle worker},description={A generic term for any magic user which the author occasionally employs in a futile attempt to seem more high-brow}}
+	\newglossaryentry{miracleworker}{
+		name={Miracle Worker},
+		text={miracle worker},
+		description={A generic term for any magic user which the author occasionally employs in a futile attempt to seem more high-brow}
+		}
 
 	\newacronym[description={An abstract measurement of how much training characters get.  PCs spend XP to buy Traits},shortplural={XP}]{xp}{XP}{Experience Point}
 
-	\newglossaryentry{natural}{name={Natural Roll},description={A natural roll is a roll where the physical dice land on some number. For example, a `natural 2' is where both dice come up facing 1, as opposed to a player gaining the result `2' from rolling a 3 and getting a -1 penalty. Similarly a `natural 12' is when the dice land on a `12' without modification}}
+	\newglossaryentry{natural}{
+		name={Natural Roll},
+		description={A natural roll is a roll where the physical dice land on some number. For example, a `natural 2' is where both dice come up facing 1, as opposed to a player gaining the result `2' from rolling a 3 and getting a -1 penalty. Similarly a `natural 12' is when the dice land on a `12' without modification}
+		}
 
 	\newacronym[description={Non Player Character -- anyone in the world played by the GM rather than a player}]{npc}{NPC}{Non Player Character}
 
-	\newglossaryentry{path}{name={Path},description={Each Path of Magic is a different way to cast spells. Each path has its own available spheres of magic and restrictions}}
+	\newglossaryentry{path}{
+		name={Path},
+		description={Each Path of Magic is a different way to cast spells. Each path has its own available spheres of magic and restrictions}
+		}
 
 	\newacronym[description={-- one of the characters run by the people playing the game}]{pc}{PC}{Player Character}
 
-	\newglossaryentry{round}{name={Round},description={A round is an abstract measurement of time during which characters can make a series of attacks or cast spells. Each new round players adjust their combat tactics}}
+	\newglossaryentry{round}{
+		name={Round},
+		description={A round is an abstract measurement of time during which characters can make a series of attacks or cast spells. Each new round players adjust their combat tactics}
+		}
 
-	\newglossaryentry{scene}{name={Scene},description={A narrative measurement of time. Each time the players decide to do something new or move somewhere else, it's a new scene. The end of combat always prompts a new scene. While scenes, unlike squares, are variable units of time, the GM is free to set a scene as some definite unit of time, such as `half an hour'}}
+	\newglossaryentry{scene}{
+		name={Scene},
+		description={A narrative measurement of time. Each time the players decide to do something new or move somewhere else, it's a new scene. The end of combat always prompts a new scene. While scenes, unlike squares, are variable units of time, the GM is free to set a scene as some definite unit of time, such as `half an hour'}
+		}
 
 	\newacronym[description={Shield Points -- magical shielding from the force sphere},shortplural={SP}]{SP}{SP}{Shield Points}
 
@@ -60,87 +103,333 @@
 
 	\newacronym[description={One silver piece is worth one hundred copper pieces},shortplural={sp},text={silver piece}]{sp}{sp}{Silver Pieces}
 
-	\newglossaryentry{sphere}{name={Sphere},description={One of the types of magic. Each sphere has 5 levels, each more difficult than the last to obtain}}
+	\newglossaryentry{sphere}{
+		name={Sphere},
+		description={One of the types of magic. Each sphere has 5 levels, each more difficult than the last to obtain}
+		}
 
-	\newglossaryentry{square}{name={Square},description={An abstract unit of measurement. We can imagine it about two yards long, as wide as the squares on your gaming board, or any other length. A more story-based game, without a board, might imagine each square is a `zone' or room -- it matters little so long as each square is a consistent size}}
+	\newglossaryentry{square}{
+		name={Square},
+		description={An abstract unit of measurement. We can imagine it about two yards long, as wide as the squares on your gaming board, or any other length. A more story-based game, without a board, might imagine each square is a `zone' or room -- it matters little so long as each square is a consistent size}
+		}
 
-	\newglossaryentry{trait}{name={Trait},description={Any gaming stat, such as a character's maximum MP, a Skill or an Attribute}}
+	\newglossaryentry{trait}{
+		name={Trait},
+		description={Any gaming stat, such as a character's maximum MP, a Skill or an Attribute}
+		}
 
 
 %%%%% Adventures in Fenestra Side Quests
 
-\newglossaryentry{spiderqueen}{name={The Spider Queen},text={the Spider Queen},description={is an old elf who collects pet chitincrawlers.  She has also started to shapeshift to look like them}}
-
-\newglossaryentry{nightguard}{name={Darren},text={Darren},description={is an active and ambitious member of the night guard},first={Darren of the Night Guard}}
-
-\newglossaryentry{alemaster}{name={Anatole},text={Anatole},description={is the highest ranking member of the temple of Alass\"{e}, who are synonymous with the Ale Guild in this region},first={Anatole, Master of the Ale Guild}}
-
-\newglossaryentry{beardedale}{name={Jafeth},text={Jafeth},description={is the leader of the Ale Guild in the Bearded Mountains, and became rich selling watered-down dwarvish ale},first={Master Jafeth of the Bearded Mountains' Ale Guild}}
-
-\newglossaryentry{krelth}{name={Krelth},description={is a curious gnomish illusionist, who often gets in trouble studying things he shouldn't}}
-
-\newglossaryentry{elfprince}{name={Prince Arinel},text={Arinel},first={Prince Arinel},description={an elf, famed for his songs}}
-
-\newglossaryentry{necromancer}{name={Antonym},first={Antonym, Fallen Priest of Qualme},description={is a priest of Qualme, from the time of Noland Beard.  He has since died, but kept himself alive in order to study Song Magic.  Unfortunately, death has robbed him of his voice}}
-
-\newglossaryentry{forestpriest}{name={Adrian},text={Adrian},description={is a half-elvish high priest of Laique, from the time of Noland Beard.  He has become irritated at how far men are encroaching into the forest, and hopes to stop them}}
-
-\newglossaryentry{baron}{name={Arthur, Townmaster},text={Lord Arthur},first={Jacob Arthur (local Townmaster)},description={is an evil landowner, currently attempting to become an Areamaster by building outwards into the local forest.  He has already found the location of a once-lost city, and plans on rebuilding it}}
-
-\newglossaryentry{cleverbaron}{name={Catelina},text={Lord Catelina},first={Villagemaster Catelina},description={is a villagemaster, currently plotting to overthrow the king by collecting magical items from the nura}}
-
-\newglossaryentry{banditking}{name={Redclaw},first={Redclaw Whiteland},description={was the child of a noble in Whiteland, but his family were killed by the king.  He's lived as a criminal ringleader ever since}}
-
-\newglossaryentry{sewerking}{name={Areth},first={Areth Whiteland},description={is a Whiteland noble, currently living under the town}}
-
-\newglossaryentry{sewerthief}{name={David},first={David Whiteland},description={misses the comforts of nobility.  He spends a lot of his time running errands through \glsentrytext{pig} and across town, such as delivering cursed magical items to \glsentrytext{banditking}}}
-
-\newglossaryentry{nurabaron}{name={Clandon, the Villagemaster},text={Villagemaster Clandon},first={Clandon, Villagemaster to Redfall,},description={was a jovial and simple Villagemaster until he had an accident with a magical item, and has since turned into an ogre}}
-
-\newglossaryentry{captain}{name={Captain Oscar Quenn},text={Captain Oscar},first={Captain Oscar of the Night Guard},description={is the captain of the Night Guard in town}}
-
-\newglossaryentry{patron}{name={The Patron},text={the Patron},first={the Patron underground},description={a mysterious man who came through the portal under the town, from the Realm of Darkness and Fire.  He has been making deals about magical items, in return for food}}
-
-\newglossaryentry{king}{name={King Wyatt Fenestra},text={King Wyatt},first={King Wyatt Fenestra},description={keeps a tight control over Fenestra through the use of magical portals}}
-
-\newglossaryentry{pigowner}{name={Wendy, Owner of \glsentrytext{pig}},text={Wendy Pig},first={Wendy, owner of \glsentrytext{pig}},description={a middle-aged, fierce woman who runs the toughest bar in town}}
-
-\newglossaryentry{bard}{name={Roger},text={Roger},first={Roger the bard},description={is a young and headstrong man who writes better than he sings}}
-
-\newglossaryentry{townmaster}{name={Townmaster Marcus},text={Lord Marcus},first={Marcus the townmaster},description={rules the local town, and takes steep taxes from the local Villagemasters.  He's an approachable and fun fellow, but generally hated by everyone who knows his tax collectors better than they know him}}
+\newglossaryentry{spiderqueen}{
+	name={The Spider Queen},
+	text={the Spider Queen},
+	description={is an old elf who collects pet chitincrawlers.  She has also started to shapeshift to look like them}
+	}
+
+\newglossaryentry{nightguard}{
+	name={Darren},
+	text={Darren},
+	description={is an active and ambitious member of the night guard},
+	first={Darren of the Night Guard}
+	}
+
+\newglossaryentry{alemaster}{
+	name={Anatole},
+	text={Anatole},
+	description={is the highest ranking member of the temple of Alass\"{e}, who are synonymous with the Ale Guild in this region},
+	first={Anatole, Master of the Ale Guild}
+	}
+
+\newglossaryentry{beardedale}{
+	name={Jafeth},
+	text={Jafeth},
+	description={is the leader of the Ale Guild in the Bearded Mountains, and became rich selling watered-down dwarvish ale},
+	first={Master Jafeth of the Bearded Mountains' Ale Guild}
+	}
+
+\newglossaryentry{krelth}{
+	name={Krelth},
+	description={is a curious gnomish illusionist, who often gets in trouble studying things he shouldn't}
+	}
+
+\newglossaryentry{elfprince}{
+	name={Prince Arinel},
+	text={Arinel},
+	first={Prince Arinel},
+	description={an elf, famed for his songs}
+	}
+
+\newglossaryentry{necromancer}{
+	name={Antonym},
+	first={Antonym, Fallen Priest of Qualm\"{e}},
+	description={is a priest of Qualm\"{e}, from the time of Noland Beard.  He has since died, but kept himself alive in order to study Song Magic.  Unfortunately, death has robbed him of his voice}
+	}
+
+\newglossaryentry{forestpriest}{
+	name={Adrian},
+	first={Adrian, high priest of Laique},
+	text={Adrian},
+	description={is a half-elvish high priest of Laique, from the time of Noland Beard.  He has become irritated at how far men are encroaching into the forest, and hopes to stop them}
+	}
+
+\newglossaryentry{baron}{
+	name={Arthur, Townmaster},
+	text={Lord Arthur},
+	first={Jacob Arthur (local Townmaster)},
+	description={is an evil landowner, currently attempting to become an Areamaster by building outwards into the local forest.  He has already found the location of a once-lost city, and plans on rebuilding it}
+	}
+
+\newglossaryentry{cleverbaron}{
+	name={Catelina},
+	text={Lord Catelina},
+	first={Villagemaster Catelina},
+	description={is a villagemaster, currently plotting to overthrow the king by collecting magical items from the nura}
+	}
+
+\newglossaryentry{banditking}{
+	name={Redclaw},
+	first={Redclaw Whiteland},
+	description={was the child of a noble in Whiteland, but his family were killed by the king.  He's lived as a criminal ringleader ever since}
+	}
+
+\newglossaryentry{sewerking}{
+	name={Areth},
+	first={Areth Whiteland},
+	description={is a Whiteland noble, currently living under the town}
+	}
+
+\newglossaryentry{sewerthief}{
+	name={David},
+	first={David Whiteland},
+	description={misses the comforts of nobility.  He spends a lot of his time running errands through \glsentrytext{pig} and across town, such as delivering cursed magical items to \glsentrytext{banditking}}
+	}
+
+\newglossaryentry{nurabaron}{
+	name={Clandon, the Villagemaster},
+	text={Villagemaster Clandon},
+	first={Clandon, Villagemaster to Redfall,},
+	description={was a jovial and simple Villagemaster until he had an accident with a magical item, and has since turned into an ogre}
+	}
+
+\newglossaryentry{captain}{
+	name={Captain Oscar Quenn},
+	text={Captain Oscar},
+	first={Captain Oscar of the Night Guard},
+	description={is the captain of the Night Guard in town}
+	}
+
+\newglossaryentry{patron}{
+	name={The Patron},
+	text={the Patron},
+	first={the underground Patron},
+	description={a mysterious man who came through the portal under the town, from the Realm of Darkness and Fire.  He has been making deals about magical items, in return for food}
+	}
+
+\newglossaryentry{king}{
+	name={King Wyatt Fenestra},
+	text={King Wyatt},
+	first={King Wyatt Fenestra},
+	description={keeps a tight control over Fenestra through the use of magical portals}
+	}
+
+\newglossaryentry{pigowner}{
+	name={Wendy, Owner of \glsentrytext{pig}},
+	text={Wendy Pig},
+	first={Wendy Pig, owner of \glsentrytext{pig}},
+	description={a middle-aged, fierce woman who runs the toughest bar in town}
+	}
+
+\newglossaryentry{bard}{
+	name={Roger},
+	text={Roger},
+	first={Roger the bard},
+	description={is a young and headstrong man who writes better than he sings}
+	}
+
+\newglossaryentry{townmaster}{
+	name={Townmaster Marcus},
+	text={Lord Marcus},
+	first={Marcus the townmaster},
+	description={rules the local town, and takes steep taxes from the local Villagemasters.  He's an approachable and fun fellow, but generally hated by everyone who knows his tax collectors better than they know him}
+	}
 
 %%%%% Adventures in Fenestra Places
 
-\newglossaryentry{redfall}{name={Redfall},first={Redfall (a village in the North)},description={is rather out-of-the-way village, famed for its red-earth clay and waterfall}}
-
-\newglossaryentry{college}{name={The College of Alchemy},text={the Collage of Alchemy},first={the Collage of Alchemy},description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
-
-\newglossaryentry{pig}{name={The Mincing Pig},text={the Mincing Pig},first={the Mincing Pig Tavern},description={boasts the reputation as the loudest tavern in town, placed close to the entrance.  Many people don't get farther than `the Pig' when coming to town}}
-
-\newglossaryentry{whitehorse}{name={The White Horse},text={the White Horse},first={the White Horse Inn},description={is a serene and esteemed establishment, with a reputation for high-quality clientel}}
-
-\newglossaryentry{lostcity}{name={The Lost City},text={the Lost City},first={the Lost City},description={is a city where men lived centuries ago.  It is now so destroyed and overgrown that people do not know they have entered until they see some part of an old stone building}}
-
-\newglossaryentry{shatteredcastle}{name={The Shattered Castle},text={the Shattered Castle},description={is where the king lives.  It has six sections in six different regions, and each one contains a magical gateway to the hub in Whiteland, so different parts of the  castle exist in different places at once}}
-
+\newglossaryentry{redfall}{
+	name={Redfall},
+	first={Redfall (a village in the North)},
+	description={is rather out-of-the-way village, famed for its red-earth clay and waterfall}
+	}
+
+\newglossaryentry{college}{
+	name={The College of Alchemy},
+	text={the College of Alchemy},
+	first={the College of Alchemy},
+	description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}
+	}
+
+\newglossaryentry{pig}{
+	name={The Mincing Pig},
+	text={the Mincing Pig},
+	first={the Mincing Pig Tavern},
+	description={boasts the reputation as the loudest tavern in town, placed close to the entrance.  Many people don't get farther than `the Pig' when coming to town}
+	}
+
+\newglossaryentry{whitehorse}{
+	name={The White Horse},
+	text={the White Horse},
+	first={the White Horse Inn},
+	description={is a serene and esteemed establishment, with a reputation for high-quality clientel}
+	}
+
+\newglossaryentry{lostcity}{
+	name={The Lost City},
+	text={the Lost City},
+	first={the Lost City},
+	description={is a city where men lived centuries ago.  It is now so destroyed and overgrown that people do not know they have entered until they see some part of an old stone building}
+	}
+
+\newglossaryentry{shatteredcastle}{
+	name={The Shattered Castle},
+	text={the Shattered Castle},
+	description={is where the king lives.  It has six sections in six different regions, and each one contains a magical gateway to the hub in Whiteland, so different parts of the  castle exist in different places but the inside of the building functions as a single palace}
+	}
 
 %%%%% Gnolls Revolt
 
-\newglossaryentry{thshen}{name={Thshe\'{n}},description={A gnoll slave who became educated to see if gnolls could learn.  He intends to free every gnoll he can from slavery}}
-
-\newglossaryentry{donald}{name={Townmaster Donald},description={A townmaster with the kind of confidence only complete ignorance can bring}}
-
-\newglossaryentry{darren}{name={Darren of the Gnolls' Guild},description={Darren is the Journeyman for the Gnolls' Guild, visiting the area to sell the services of more gnolls}}
-
-\newglossaryentry{dhagh}{name={Dhagh},description={Chief tactician of the newly freed gnolls}}
-
-\newglossaryentry{tailtwitch}{name={Tailtwitch},description={A mischevious gnoll, known for pinching items}}
-
-\newglossaryentry{bigchap}{name={Big Chap},description={A giant of a gnoll, ready to unleash hell}}
-
-\newglossaryentry{colin}{name={Colin},first={Guildmaster Colin},description={Captain of the Gnolls' Guild at Keliesend}}
-
-%%%%% Adventures in Whiteland
+\newglossaryentry{thshen}{
+	name={Thshe\'{n}},
+	description={a gnoll slave who became educated to see if gnolls could learn.  He intends to free every gnoll he can from slavery}
+	}
+
+\newglossaryentry{donald}{
+	name={Townmaster Donald},
+	description={a townmaster with the kind of confidence only complete ignorance can bring}
+	}
+
+\newglossaryentry{darren}{
+	name={Darren of the Gnolls' Guild},
+	description={the Journeyman for the Gnolls' Guild, visiting the area to sell the services of more gnolls}
+	}
+
+\newglossaryentry{dhagh}{
+	name={Dhagh},
+	description={Chief tactician of the newly freed gnolls}
+	}
+
+\newglossaryentry{tailtwitch}{
+	name={Tailtwitch},
+	description={a mischevious gnoll, known for pinching items}
+	}
+
+\newglossaryentry{bigchap}{
+	name={Big Chap},
+	description={a giant of a gnoll, ready to unleash hell}
+	}
+
+\newglossaryentry{colin}{
+	name={Colin},
+	first={Guildmaster Colin},
+	description={Captain of the Gnolls' Guild at Keliesend}
+	}
+
+%%%%% Adventures in Eastlake
+
+\newglossaryentry{nightfog}{
+	name={Night Fog},
+	description={fills the hallways every night.  The attempt to keep the young ones in bed throughout the night never works, but it \emph{does} make moving around a lot harder}
+	text={the Night Fog}
+	first={the Night Fog\footnote{The \glsentrytext{college}'s lower floor is filled with magical mist each night to stop the young ones running around}}
+	}
+
+\newglossaryentry{fishtown}{
+	name={Fishtown},
+	description={the closest town to \glsentrytext{college}, known throughout the world for its clear waters}
+	}
+
+\newglossaryentry{whitewastes}{
+	name={The White Wastes},
+	text={the White Wastes},
+	description={the snow-covered mountainous region a day's march from \glsentrytext{college}, where the undead swarm}
+	}
+
+\newglossaryentry{deanconjuration}{
+	name={Andrew Fore, the Dean of Conjuration,},
+	description={the quintessential alchemist who, due to too much inhalation of dangerous materials, has acquired a lethal cough},
+	text={the Dean of Conjuration},
+	first={Andrew Fore, the Dean of Conjuration}
+	}
+
+\newglossaryentry{deanforce}{
+	name={The Dean of Forces},
+	description={Derren Kisha},
+	text={the Dean of Forces},
+	first={Derren Kisha, the Dean of Forces}
+	}
+
+\newglossaryentry{deanmetamagic}{
+	name={Ashkal Quennom, the Dean of Metamagics},
+	text={the Dean of Metamagics},
+	description={answers every question with two more, and has the irritating habit of shaving his beard and then socializing with the younger alchemists},
+	first={Ashkal Quennom, Dean of Metamagics}
+	}
+
+\newglossaryentry{deaninvocation}{
+	name={The Dean of Invocation},
+	description={is a wizzened and completely hairless creature who still, at the age of 80, cannot sit still for ten minutes, and wanders, occasionally twitching, while lecturing people on everything at all occasions},
+	text={the Dean of Invocation},
+	first={Adrian Stein, the Dean of Invocation}
+	}
+
+\newglossaryentry{moore}{
+	name={Alen Marsh},
+	description={the old wizard, responsible for selling illegal magics, and refusing to obey the formal laws on magic.  Derisively called `Dean of the Marsh' by guild mages},
+	text={Alen Marsh},
+	first={Alen Marsh, Dean of the Marsh}
+	}
+
+\newglossaryentry{prefforce}{
+	name={Prefect Sailon Alisa the Prefect},
+	description={a sly young man from the Quennome region whose elven grandmother has left him noticeably shorter than the other students},
+	text={Sailon},
+	first={Sailon Alisa}
+	}
+
+\newglossaryentry{prefconjuration}{
+	name={Prefect Dane Arthur the Prefect},
+	description={a bright eyed young farmhand, who still patches his own clothes},
+	text={Dane},
+	first={Prefect Dane Arthur}
+	}
+
+\newglossaryentry{prefmetamagic}{
+	name={Iseobel Ventress the Prefect},
+	description={Prefect Iseobel Ventress},
+	text={Prefect Ventress},
+	first={Prefect Iseobel Ventress}
+	}
+
+\newglossaryentry{whitelies}{
+	name={Chloe Firya},
+	description={is a hyperactive, petulant lier, with a greater imagination than all the bards in the North combined.  She's fond of faking magical ability using illusion magics},
+	text={Chloe},
+	first={Chloe Firya}
+	}
+
+\newglossaryentry{rat}{
+	name={Roger Stein (rat)},
+	description={comes from a long line of powerful mages, and carries with him a potent magical ring.  He takes the nickname ``rat'' from his habit of rubbing his nose},
+	text={Roger},
+	first={Roger Stein (the rat)}
+	}
+
+\newglossaryentry{headmaster}{
+	name={The Headmaster},
+	text={the Head},
+	description={came from riches in Mount Arthur, maintained his family's age-old tradition of running \glsentrytext{college} and currently works hard to maintain the status quo},
+	first={Headmaster Aron Arthur}
+	}
 
 \newglossaryentry{fishtown}{name={Fishtown},description={The closest town to \glsentrytext{college}, known throughout the world for its clear waters}}
 
diff --git a/main.tex b/main.tex
new file mode 100644
index 0000000000000000000000000000000000000000..863e7f2eeb456dc23eaa0ce025fadfb77068b4d3
--- /dev/null
+++ b/main.tex
@@ -0,0 +1,20 @@
+\documentclass[a4paper,openany]{report}
+\usepackage{glossaries}
+
+\input{config/glossary.tex}
+\input{config/preamble.tex}
+\input{config/monsters.tex}
+
+\settoggle{verbose}{true}
+
+\begin{document}
+
+%\pagenumbering{roman}
+
+\tableofcontents
+
+\pagebreak
+
+
+\end{document}
+
diff --git a/monsters.tex b/monsters.tex
index 43853456a52d15593f9ba70fedfb2d3edb32b11c..5e7a08b3687b3a994eaddbc3383f272079a5b1a8 100644
--- a/monsters.tex
+++ b/monsters.tex
@@ -4,9 +4,9 @@
 % If you're unhapy with your dragon, copy-paste the bit where it says \dragon{blah}{bla}, then change those numbers.
 
 \newcounter{bestiarychapter}
+\setcounter{bestiarychapter}{0}
 \newcounter{age}
 \setcounter{age}{1}
-\setcounter{bestiarychapter}{0}
 \setcounter{gold}{0}
 \setcounter{enc}{0}
 
@@ -129,6 +129,7 @@
 \newcommand{\greatclub}{Greatclub\addtocounter{str}{4}\addtocounter{spd}{1}\addtocounter{dex}{1}}
 \newcommand{\longbow}{Longbow\addtocounter{str}{1}}
 
+% ARMOUR
 \newcommand{\partialleather}{partial leather armour \addtocounter{dr}{3}}
 \newcommand{\partialchain}{partial chain armour \addtocounter{dr}{4}}
 \newcommand{\partialplate}{partial plate armour \addtocounter{dr}{5}}
@@ -156,7 +157,7 @@
 \setcounter{int}{#1}\setcounter{wts}{#2}\setcounter{cha}{#3}
 }
 %
-%
+
 %%%%%%%%%%% Person
 %
 \newcommand{\person}[9]{\settoggle{mind}{true}
@@ -217,7 +218,7 @@
 	\setcounter{mpb}{0}
 	\setcounter{xpbonus}{0}
 
-	}
+}
 
 %%       _   _        _ _           _            
 %%  __ _| |_| |_ _ __(_) |__  _   _| |_ ___  ___ 
@@ -362,7 +363,7 @@
 %%%%%%%%%%%%%%%%%%%% Creature Abilities
 
 \newcommand{\abilities}[1]{ \\
-	\ent{Abilities} & #1 
+	\ent{Abilities:} & #1 
 	}
 
 	\newcommand{\teeth}{Teeth (+1 Damage) \addtocounter{str}{1}
@@ -390,73 +391,173 @@
 
 
 \newcommand{\auroch}{
-	\animal{2}{-2}{3}{1}{2}{1}{Athletics 1}{Stampede}{\addtocounter{xpbonus}{-4}}
+\animal{2}% STRENGTH
+{-2}% DEXTERITY 
+{3}% SPEED
+{1}% WITS
+{2}% DR
+{1}% AGGRESSION
+{Athletics 1}% SKILLS
+{Stampede}% ABILITIES
+{\addtocounter{xpbonus}{-4}}
 }
 
 \newcommand{\bear}{
-	\animal{5}{-1}{4}{0}{2}{2}{Athletics 2, Stealth 2, Survival 2, Vigilance 2}{None}
+\animal{5}% STRENGTH
+{-1}% DEXTERITY 
+{4}% SPEED
+{0}% WITS
+{2}% DR
+{2}% AGGRESSION
+{Athletics 2, Stealth 2, Survival 2, Vigilance 2}% SKILLS
+{None}% ABILITIES
+{}
 }
 %
 \newcommand{\boar}{
-	\animal{4}{-2}{3}{1}{2}{2}{Survival 1, Vigilance 1}{}
-	}
-%
+	\animal{4}% STRENGTH
+{-2}% DEXTERITY 
+{3}% SPEED
+{1}% WITS
+{2}% DEXTERITY 
+{2}% AGGRESSION
+{Survival 1, Vigilance 1}% STRENGTH
+{}% ABILITIES
+{}
+}
+
 \newcommand{\chitincrawler}{
 	\randomtwo
-	\animal{\ifodd\value{chapter} 4\else 3\fi}{\ifodd\value{page} 1\else 0\fi}{\arabic{random}}{\arabic{random}}{3}{4}{Athletics 2, Survival 1}{}
+\animal{\ifodd\value{chapter} 4\else 3\fi}% STRENGTH
+{\ifodd\value{page} 1\else 0\fi}% DEXTERITY 
+{\arabic{random}}% SPEED
+{\arabic{random}% WITS
+}{3}% DR
+{4}% AGGRESSION
+{Athletics 2, Survival 1}% SKILLS
+{}% ABILITIES
+{}
 }
 %
 \newcommand{\griffin}{
-	\animal{\ifodd\value{page} 2\else 1\fi}{-2}{\ifodd\value{page} 2\else 1\fi}{2}{0}{2}{Athletics 2, Survival 1\knacks{\charge}}{Flight}
+\animal{\ifodd\value{page} 2\else \ifodd\value{chapter} 3\else 1\fi\fi}% STRENGTH
+{-2}% DEXTERITY 
+{\ifodd\value{page} 2\else 1\fi}% SPEED
+{2}% WITS
+{0}% DEXTERITY 
+{2}% AGGRESSION
+{Athletics 2, Survival 1\knacks{\charge}}% SKILLS
+{Flight}% ABILITIES
+{}
 }
-%
+
 \newcommand{\mouthdigger}{
-	\animal{2}{-1}{3}{0}{2}{2}{Stealth 2, Tactics 2, }{}{\knacks{\firststrike , \adrenalinesurge , \perfectsneakattack}}
+\animal{2}% STRENGTH
+{-1}% DEXTERITY 
+{3}% SPEED
+{0}% WITS
+{2}% DR
+{2}% AGGRESSION
+{Stealth 2, Tactics 2, \knacks{\firststrike , \adrenalinesurge , \perfectsneakattack}}% SKILLS
+{}% ABILITIES
+{}
 }
 %
 \newcommand{\wolf}{
-	\animal{-1}{-1}{3}{1}{2}{1}{Athletics 2, Survival 1, Tactics 1}{}
+\animal{-1}% STRENGTH
+{-1}% DEXTERITY 
+{3}% SPEED
+{1}% WITS
+{2}% DR
+{1}% AGGRESSION
+{Athletics 2, Survival 1, Tactics 1}% SKILLS
+{}% ABILITIES
+{}
 }
 
 \newcommand{\woodspy}{
 	\randomthree\randomtwo\addtocounter{enc}{2}
-	\person{\arabic{random}}{\arabic{enc}}{2}{{-4}{2}{-5}}{2}{0}{Athletics 2, Stealth 4, Survival 2, Tactics 2}{None}{}
+\person{\arabic{random}}% STRENGTH
+{\arabic{enc}}% DEXTERITY 
+{2}% SPEED
+{{-4}% INTELLIGENCE
+{2}% WITS
+{-5}}% CHARISMA
+{2}% DR
+{\arabic{random}}% AGGRESSION
+{Athletics 2, Stealth 4, Survival 2, Tactics 2}% SKILLS
+{None}% ABILITIES
+{}
 }
 
 \newcommand{\basilisk}{
-	\randomthree\addtocounter{age}{5}\randomtwo\addtocounter{random}{1}
-	\animal{\arabic{age}}{-2}{\arabic{random}}{0}{4}{2}{Projectiles 1, Athletics 2, \abilities{Odour demands Strength check, TN 9. Acidic breath (1D6-2 Damage).}}{}{\knacks{\unstoppable}}
+\randomthree\addtocounter{age}{5}\randomtwo\addtocounter{random}{1}
+\animal{\arabic{age}}{-2}{\arabic{random}}{0}{4}{2}{Projectiles 1, Athletics 2, \abilities{Odour demands Strength check, TN 9. Acidic breath (1D6-2 Damage).}}{}{\knacks{\unstoppable}}
 }
 
 %
 \newcommand{\dragon}{
-	\ifnumcomp{\thechapter}{<}{6}{\setcounter{age}{6}}{\ifnumcomp{\thechapter}{>}{9}{\setcounter{age}{7}}{\setcounter{age}{\thechapter}}}
-	\person{\arabic{age}}{3}{4}{{3}{4}{2}}{4\addtocounter{age}{-5}}{\arabic{age}}{Aggression 2, Projectiles \addtocounter{age}{1}\arabic{age}, Academics \arabic{age}, Athletics 1, Deceit \arabic{age}, Tactics 2, Vigilance 3}{%
-		\ifnumcomp{\value{bestiarychapter}}{=}{\thechapter}{$3D6\times 100$gp, sitting in a lair.}{\setcounter{gold}{\thepage}\addtocounter{gold}{-50}\multiply\value{gold} by \value{list}\multiply\value{gold} by \thechapter \ifnumcomp{\value{gold}}{>}{0}{ \arabic{gold}gp in lair in assorted change}{None}}}%
-		{\knacks{\combatcaster, \backtothewall\ifnumcomp{\value{age}}{>}{3}{\laststand}{}},\abilities{Flight}\Path{Blood}{Enchantment \addtocounter{age}{-1}\arabic{age}, Invocation \addtocounter{age}{1} \ifnumcomp{\value{age}}{<}{3}{3}{\arabic{age}} }\addtocounter{age}{1}\multiply\value{age} by 2 \mana{\arabic{age}}\gdef\armourtype{C}}
+\ifnumcomp{\thechapter}{<}{6}{\setcounter{age}{6}}{\ifnumcomp{\thechapter}{>}{9}{\setcounter{age}{7}}{\setcounter{age}{\thechapter}}}\randomtwo\addtocounter{random}{2}
+	\person{\arabic{age}}% STRENGTH
+	{3}% DEXTERITY
+	{4}% SPEED
+	{{3}% INTELLIGENCE
+	{\arabic{random}}% WITS
+	{\ifodd\value{page}-2\else1\fi}}% CHARISMA
+	{4\addtocounter{age}{-5}}{\arabic{age}}{Aggression 2, Projectiles \addtocounter{age}{1}\arabic{age}, Academics \arabic{age}, Athletics 1, Deceit \arabic{age}, Tactics 2, Vigilance 3}{%
+	\ifnumcomp{\value{bestiarychapter}}{=}{\thechapter}{$3D6\times 100$gp, sitting in a lair.}{\setcounter{gold}{\thepage}\addtocounter{gold}{-50}\multiply\value{gold} by \value{list}\multiply\value{gold} by \thechapter \ifnumcomp{\value{gold}}{>}{0}{ \arabic{gold}gp in lair in assorted change}{None}}}%
+	{\knacks{\ifodd\value{chapter}\combatcaster\else\backtothewall\fi,\ifnumcomp{\value{age}}{>}{3}{\laststand}{\backtothewall, \adrenalinesurge}}, \abilities{Flight}\Path{Blood}{Enchantment \addtocounter{random}{-1}\arabic{random}, Invocation \addtocounter{age}{1} \ifnumcomp{\value{age}}{<}{3}{3}{\arabic{age}} }\addtocounter{age}{1}\multiply\value{age} by 2 \mana{\arabic{age}}\gdef\armourtype{C}}
 	}
 
 \newcommand{\dwarventrader}{
-	\randomthree\randomtwo
-	\person{\arabic{random}}{1}{-1}{{\ifnumcomp{\value{random}}{=}{2}{1}{0}}{0}{0}}{0}{1}{Crafts \ifodd\value{page} 1 \else 2\fi, Deceit \ifodd\value{page} 2 \else 1\fi}{\shortsword\ifnumcomp{\thechapter}{=}{6}{3D6sp}{\setcounter{gold}{\thepage}, \arabic{gold}sp}}{}
+	\randomthree\randomtwo\addtocounter{random}{-1}
+	\person{\arabic{random}}% STRENGTH
+	{1}% DEXTERITY
+	{-1}% SPEED
+	{{\ifnumcomp{\value{random}}{=}{2}{1}{0}}% INTELLIGENCE
+	{0}% WITS
+	{0}}% CHARISMA
+	{0}% DR
+	{1}% COMBAT
+	{Crafts \ifodd\value{page} 1 \else 2\fi, Deceit \ifodd\value{chapter} 2 \else 1\fi}% SKILLS
+	{\shortsword\ifnumcomp{\thechapter}{=}{6}{3D6sp}{\setcounter{gold}{\thepage}, \arabic{gold}sp}}% EQUIPMENT
+	{}
 	}
 %
 \newcommand{\dwarvensoldier}{
 	\randomtwo
-	\person{\arabic{random}}{\arabic{enc}}{0}{{0}{0}{-1}}{0}{2}{Crafts 1, Tactics 1}{\greataxe, \completeplate}{\knacks{Chosen Enemy: Goblins}}
+	\person{\arabic{random}}% STRENGTH
+	{\arabic{enc}}% DEXTERITY
+	{0}%Speed
+	{{0}{0}{-1}}% MENTAL ATTRIBUTES
+	{0}{2}{Crafts 1, Tactics 1}{\greataxe, \completeplate}{\knacks{Chosen Enemy: Goblins}}
 	}
 
 \newcommand{\dwarvenrunemaster}{
-	\person{0}{1}{0}{{2}{0}{0}}{0}{1}{Academics 2, Crafts 1, Tactics 2\Path{Runes}{Metamagic 4, Fate 3, Force 2, Conjuration 1}}{\shortsword\partialchain\ifnumcomp{\thechapter}{=}{6}{4D6sp}{\setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter\arabic{gold}sp}}{\mana{4}}
+	\person{0}{1}{0}% PHYSICAL ATTRIBUTES
+	{{\ifodd\value{page}2\else\1\fi}% INTELLIGENCE
+	{\ifodd\value{chapter}1\else0\fi}{0}}%  WITS
+	{\ifodd\value{enc}-1\else0\fi}% CHARISMA
+	{1}{Academics 2, Crafts 1, Tactics 2\Path{Runes}{Metamagic 4, Fate 3, Force 2, Conjuration 1}}{\shortsword\partialchain\ifnumcomp{\thechapter}{=}{6}{4D6sp}{\setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter\arabic{gold}sp}}{\mana{4}}
 	}
 
 \newcommand{\dryad}{
-	\person{4}{2}{2}{{4}{2}{1}}{6}{2}{Academics 3, Athletics 1, Crafts 2, Performance 3, Empathy 2, Survival 3\Path{Blood \& Song}{Polymorph 5, Aldaron 4, Fate 3, Metamagic 2}}{\Dagger}{\mana{6}\lockedmana{5}\gdef\armourtype{C}}
+\randomtwo\addtocounter{enc}{2}\randomthree\addtocounter{age}{1}
+	\person{4}% STRENGTH
+	{\arabic{random}}% DEXTERITY
+	{1}% SPEED
+	{{\arabic{age}}% INTELLIGENCE
+	{2}% WITS
+	{1}}% CHARISMA
+	{6}% DR
+	{\arabic{random}}% COMBAT
+	{Academics 3, Athletics 1, Crafts 2, Performance 3, Empathy 2, Survival 3\Path{Blood \& Song}{Polymorph 5, Aldaron 4, Fate 3, Metamagic 2}}% SKILLS
+	{\Dagger}% EQUIPMENT
+	{\mana{6}\lockedmana{5}\gdef\armourtype{C}}
 	}
 
 \newcommand{\elf}{
-	\randomthree
-	\setcounter{enc}{1}\addtocounter{enc}{-\value{age}}
+	\randomthree\setcounter{enc}{1}\addtocounter{enc}{-\value{age}}
 	\person{\value{enc}}%STRENGTH
 	{\value{age}}%DEXTERITY
 	{1}%SPEED
@@ -482,200 +583,586 @@
 	}
 
 \newcommand{\gnome}{
-	\person{-2}{-1}{1}{{1}{0}{0}}{0}{0}{Academics 1, Crafts 1, Empathy 1, Pickpocketing 1, Stealth 1\Path{Alchemy}{Illusion \ifodd\value{chapter} 1\else 2\ifodd\value{page} Invocation 1\fi\fi}}{%
-		\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{Promisary note}{\ifnumcomp{\thechapter}{>}{2}{\multiply\value{enc} by \thechapter \ifnumcomp{\value{enc}}{>}{0}{\divide\value{enc} by 500 \ifnumcomp{\value{enc}}{>}{0}{Big ruby worth \arabic{enc}gp}{Green emerald worth \thepage sp}}{Glimmering diamond worth \thepage gp}}{interesting piece of lizardite.}}}%
-	}
+	\randomtwo
+\person{-2}% STRENGTH
+{-1}% DEXTERITY 
+{1}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{0}% WITS
+{\arabic{random}}}% CHARISMA
+{0}% DR
+{0}% AGGRESSION
+{Academics 1, Crafts 1, Empathy 1, Pickpocketing 1, Stealth 1\Path{Alchemy}{Illusion \ifodd\value{chapter} 1\else 2\ifodd\value{page} Invocation 1\fi\fi}}% SKILLS
+{\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{Promisary note}{\ifnumcomp{\thechapter}{>}{2}{\multiply\value{enc} by \thechapter \ifnumcomp{\value{enc}}{>}{0}{\divide\value{enc} by 500 \ifnumcomp{\value{enc}}{>}{0}{Big ruby worth \arabic{enc}gp}{Green emerald worth \thepage sp}}{Glimmering diamond worth \thepage gp}}{interesting piece of lizardite.}}}
+{}
+}
 
 \newcommand{\gnomishillusionist}{
-	\person{-3}{-2}{1}{{3}{2}{0}}{0}{0}{Projectiles 1, Academics 3, Crafts 2, Deceit 1,  Stealth 2\Path{Alchemy}{Conjuration 3, Force 2, Illusion 4, Metamagic 2}}{%
-		\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{Promisary note}{\ifnumcomp{\thechapter}{>}{2}{\multiply\value{enc} by \thepage \ifnumcomp{\value{enc}}{>}{0}{\divide\value{enc} by 100 \ifnumcomp{\value{enc}}{>}{0}{Giant ruby worth \arabic{enc}gp}{Green emerald worth \thepage gp}}{Glimmering diamond worth \thepage gp}}{\setcounter{gold}{\thechapter}\addtocounter{gold}{1} interesting piece of quartz.}}}%
-		{\mana{6}}
-	}
+	\randomtwo\randomthree\addtocounter{random}{1}
+\person{-3}% STRENGTH
+{-2}% DEXTERITY 
+{1}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{2}% WITS
+{\arabic{enc}}}% CHARISMA
+{0}% DR
+{0}% COMBAT
+{Projectiles \arabic{enc}, Academics 3, \ifodd\value{chapter} Crafts \arabic{enc},\fi Deceit \arabic{age},  Stealth \arabic{enc}\Path{Alchemy}{Conjuration \arabic{age}, \ifodd\value{page} Force \arabic{enc},\fi Illusion \arabic{random}, Metamagic \arabic{age}}}% SKILLS
+{\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{Promisary note}{\ifnumcomp{\thechapter}{>}{2}{\multiply\value{enc} by \thepage \ifnumcomp{\value{enc}}{>}{0}{\divide\value{enc} by 100 \ifnumcomp{\value{enc}}{>}{0}{Giant ruby worth \arabic{enc}gp}{Green emerald worth \thepage gp}}{Glimmering diamond worth \thepage gp}}{\setcounter{gold}{\thechapter}\addtocounter{gold}{1} interesting piece of quartz.}}}%
+{\mana{6}}
+}
 
 \newcommand{\humanfarmer}{
-	\person{1}{0}{0}{{0}{-1}{\ifodd \value{chapter} -1\else1\fi}}{0}{\ifodd\thepage 0\else 1\fi}{Beast Ken 2, Crafts 2, \ifodd\thechapter Empathy 1\fi}{\Dagger , \thechapter cp in a purse.}
-	}
+	\randomthree\addtocounter{random}{-2}
+\person{\arabic{age}}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{-1}% WITS
+{\ifodd \value{chapter} -1\else1\fi}}% CHARISMA
+{0}% DR
+{\ifodd\thepage 0\else 1\fi}% AGGRESSION
+{Beast Ken 2, Crafts 2, \ifodd\thechapter Empathy 1\fi}% SKILLS
+{\Dagger , \thechapter cp in a purse.}% EQUIPMENT
+{}
+}
 
 \newcommand{\humanmaid}{
-	\random
-	\person{1}{\ifodd \value{age} -1\else1\fi}{0}{{\ifodd\value{age} 0\else 1\fi}{-1}{0}}{0}{\ifodd\thepage 0\else 1\fi}{Empathy 1, \ifodd\thechapter Deceit 1\fi}{\Dagger \thechapter cp in a purse.}
-	}
+	\randomthree
+\person{1}% STRENGTH
+{\ifodd \value{age} -1\else1\fi}% DEXTERITY 
+{0}% SPEED
+{{\ifodd\value{age} 0\else 1\fi}% INTELLIGENCE
+{-1}% WITS
+{0}}% CHARISMA
+{0}% DR
+{\ifodd\thepage 0\else 1\fi}% AGGRESSION
+{Empathy 1, \ifodd\thechapter Deceit 1\fi}% SKILLS
+{\Dagger \thechapter cp in a purse.}% EQUIPMENT
+{}
+}
 
 \newcommand{\humantrader}{
-	\person{1}{0}{0}{{0}{-1}{\ifodd\thepage 0\else 1\fi}}{0}{0}{Academics 1, Crafts 1}{\Dagger \thepage cp in a purse, and \thechapter sp hidden nearby.}
-	}
+	\randomtwo\addtocounter{enc}{-1}
+\person{\arabic{random}}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{\arabic{enc}}% INTELLIGENCE
+{-1}% WITS
+{\ifodd\thepage 0\else 1\fi}}% CHARISMA
+{0}% DR
+{\arabic{enc}}% AGGRESSION
+{Academics 1, Crafts 1}% SKILLS
+{\Dagger \thepage cp in a purse, and \thechapter sp hidden nearby.}% EQUIPMENT
+{}
+}
 
 \newcommand{\humandiplomat}{
-	\person{\ifodd\value{page} 0\else 1\fi}{1}{0}{{1}{0}{1}}{0}{1}{Academics 2, Deceit 2, Empathy 1, Vigilance 2}{\Dagger, \setcounter{gold}{\thepage}\addtocounter{gold}{\thechapter}\arabic{gold}cp, \divide\value{gold} by 3 \arabic{gold}sp stored secretly nearby.}
-	}
+	\randomtwo\randomthree\addtocounter{random}{\value{enc}}\addtocounter{random}{-3}
+\person{\ifodd\value{page} 0\else 1\fi}% STRENGTH
+{1}% DEXTERITY 
+{0}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{0}% WITS
+{\arabic{enc}}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Academics 2, Deceit \arabic{age}, \ifodd\value{gold} Empathy \arabic{enc},\fi Vigilance \arabic{enc}}% SKILLS
+{\Dagger, \setcounter{gold}{\thepage}\addtocounter{gold}{\thechapter}\arabic{gold}cp, \divide\value{gold} by 3 \arabic{gold}sp stored secretly nearby.}% EQUIPMENT
+{}
+}
 
 \newcommand{\humanpriest}{
 	\randomthree
-	\person{\ifnum\value{enc}>5 3\else 0\fi}{0}{0}{{\arabic{age}}{0}{\ifodd\thepage 0\else 1}}{0}{\ifnum\value{enc}>3 0 \else 1 \fi}{Academics \arabic{age}, Empathy \ifnum\value{enc}<2 2\else 1\fi\Path{Devotion}{Fate \arabic{age}\ifodd\thepage \else \randomtwo Aldaron \arabic{enc}\fi}}{\ifodd\thechapter\quarterstaff\else\Dagger\fi}{\multiply\value{age} by 2\mana{\arabic{age}}}
-	}
+\person{\ifnum\value{enc}>5 3\else 0\fi}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{\arabic{age}}% INTELLIGENCE
+{0}% WITS
+{\ifodd\thepage 0\else 1}}% CHARISMA
+{0}% DR
+{\ifnum\value{enc}>3 0 \else 1 \fi}% AGGRESSION
+{Academics \arabic{age}, Empathy \ifnum\value{enc}<2 2\else 1\fi\Path{Devotion}{Fate \arabic{age}\ifodd\thepage \else \randomtwo Aldaron \arabic{enc}\fi}}% SKILLS
+{\ifodd\thechapter\quarterstaff\else\Dagger\fi}% ABILITIES
+{\multiply\value{age} by 2\mana{\arabic{age}}}
+}
 
 \newcommand{\humansoldier}{
-	\random
-	\person{2}{\ifodd\thepage 0 \else 1\fi}{1}{{0}{-1}{0}}{0}{\ifodd\thechapter 2 \else 1\fi}{Beast Ken 1, Survival \ifodd\thechapter 2 \else 1\fi, Tactics 1}{\ifnum\value{age}>8{\greatsword}\else\ifnum\value{age}>4{\longsword}\else{\greataxe}\fi\fi, \ifnum\value{age}=3\partialleather\else\partialchain\fi, \setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter \divide\value{gold} by 10\addtocounter{gold}{1}\arabic{gold}cp}{}
-	}
+	\randomtwo
+\person{2}% STRENGTH
+{\ifodd\thepage 0 \else 1\fi}% DEXTERITY 
+{\arabic{random}}% SPEED
+{{0}% INTELLIGENCE
+{-1}% WITS
+{0}}% CHARISMA
+{0}% DR
+{\ifodd\thechapter 2 \else 1\fi}% AGGRESSION
+{Beast Ken 1, Survival \ifodd\thechapter 2 \else 1\fi, Tactics 1}% SKILLS
+{\ifnum\value{age}>8{\greatsword}\else\ifnum\value{age}>4{\longsword}\else{\greataxe}\fi\fi, \ifnum\value{age}=3\partialleather\else\partialchain\fi, \setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter \divide\value{gold} by 10\addtocounter{gold}{1}\arabic{gold}cp}% ABILITIES
+{}
+}
 
 \newcommand{\humanarcher}{
-	\random
-	\person{2}{1}{0}{{0}{-1}{0}}{0}{1}{Projectiles 2, Crafts \ifodd\thechapter 1 \else 2\fi, Survival \ifodd\thechapter 2 \else 1\fi, Tactics 1}{\longbow, dagger, \partialleather}{}
-	}
+	\randomtwo
+\person{2}% STRENGTH
+{1}% DEXTERITY 
+{0}% SPEED
+{{0}% INTELLIGENCE
+{-1}% WITS
+{0}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Projectiles 2, Crafts \ifodd\thechapter 1 \else 2\fi, Survival \ifodd\thechapter 2 \else 1\fi, Tactics 1}% SKILLS
+{\longbow, dagger, \partialleather}% EQUIPMENT
+{}
+}
 
 \newcommand{\humanthief}{
-	\random
-	\person{1}{\ifodd\thepage 2 \else 1\fi}{1}{{0}{0}{0}}{0}{\ifodd\thechapter 2 \else 1\fi}{Athletics 2, Deceit \ifodd\thepage 2 \else 1\fi, Tactics 1}{\ifnum\value{enc}>5{\shortsword, dagger}\else\ifnum\value{age}>2{\rapier, dagger}\else{\longsword}\fi\fi \ifnum\value{age}=3\partialleather \fi \setcounter{gold}{\thepage}\divide\value{gold} by 4\addtocounter{gold}{3}, \arabic{gold}cp}{}
-	}
+	\randomtwo
+\person{1}% STRENGTH
+{\ifodd\thepage 2 \else 1\fi}% DEXTERITY 
+{1}% SPEED
+{{0}% INTELLIGENCE
+{0}% WITS
+{0}}% CHARISMA
+{0}% DR
+{\ifodd\thechapter 2 \else 1\fi}% AGGRESSION
+{Athletics 2, Deceit \ifodd\thepage 2 \else 1\fi, Tactics 1}% SKILLS
+{\ifnum\value{enc}>5{\shortsword, dagger}\else\ifnum\value{age}>2{\rapier, dagger}\else{\longsword}\fi\fi \ifnum\value{age}=3\partialleather \fi \setcounter{gold}{\thepage}\divide\value{gold} by 4\addtocounter{gold}{3}, \arabic{gold}cp}% EQUIPMENT
+{}
+}
 
 \newcommand{\humanalchemist}{
 	\randomthree
-	\person{\ifodd\thepage 0 \else 1\fi}{0}{0}{{\ifodd\value{page} 3 \else 1\fi}{\ifodd\value{page} -1 \else 1 \fi}{0}}{0}{\ifodd\value{chapter} 0 \else 1\fi}{Academics \arabic{age}, Deceit \ifodd\thepage 2 \else 1, Tactics 1\fi\Path{Alchemy}{\ifodd\value{chapter} Conjuration \arabic{age}, Invocation 3, \ifnum\value{enc}<5 Metamagic \arabic{enc}\fi\else \randomtwo Conjuration \arabic{enc}, Forces \arabic{age}, Metamagic 2\fi}}{\setcounter{age}{\value{random}}\addtocounter{age}{\value{age}}Mana stone jewel with \arabic{age} mana, \thechapter gp, \thepage sp}{\mana{4}\lockedmana{\arabic{random}}}
-	}
+\person{\ifodd\thepage 0 \else 1\fi}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{\ifodd\value{page} 3 \else 1\fi}% INTELLIGENCE
+{\ifodd\value{page} -1 \else 1 \fi}% WITS
+{0}}% CHARISMA
+{0}% DR
+{\ifodd\value{chapter} 0 \else 1\fi}% AGGRESSION
+{Academics \arabic{age}, Deceit \ifodd\thepage 2 \else 1, Tactics 1\fi\Path{Alchemy}{\ifodd\value{chapter} Conjuration \arabic{age}, Invocation 3, \ifnum\value{enc}<5 Metamagic \arabic{enc}\fi\else \randomtwo Conjuration \arabic{enc}, Forces \arabic{age}, Metamagic 2\fi}}% SKILLS
+{\setcounter{age}{\value{random}}\addtocounter{age}{\value{age}}Mana stone jewel with \arabic{age} mana, \thechapter gp, \thepage sp}% EQUIPMENT
+{\mana{4}\lockedmana{\arabic{random}}}
+}
 
 \newcommand{\gnollhunter}{
 	\randomtwo\addtocounter{enc}{1}
-	\person{\arabic{enc}}{\ifodd\thepage 2 \else 1\fi}{1}{{-1}{1}{-1}}{0}{1}{Aggression 2, Projectiles 1, Survival 3\knacks{\adrenalinesurge}}{\spear}{}
+\person{\arabic{enc}}% STRENGTH
+{\ifodd\thepage 2 \else 1\fi}% DEXTERITY 
+{1}% SPEED
+{{-1}% INTELLIGENCE
+{1}% WITS
+{-1}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Aggression 2, Projectiles 1, Survival 3\knacks{\adrenalinesurge}}% SKILLS
+{\spear}% EQUIPMENT
+{}
 	}
 
 \newcommand{\gnollshaman}{
-	\randomthree
-	\ifnum\value{enc}>4{\setcounter{enc}{4}}\else{\ifnum\value{enc}<0{\setcounter{enc}{1}}\else{}\fi}\fi
-	\setcounter{enc}{\value{age}}\setcounter{enc}{\value{enc}}\ifodd\thechapter\addtocounter{enc}{-1}\else\addtocounter{enc}{-1}\fi \ifnum\value{enc}<1{\setcounter{enc}{1}}\fi
-
-	\addtocounter{age}{-1}
-	\person{1}{0}{0}{{\arabic{age}\addtocounter{age}{1}}{1}{-2}}{0}{1}{Aggression 2, Projectiles \arabic{age}, Academics \arabic{age}, Beast Ken \arabic{age}, Stealth \arabic{enc}, \ifnum\value{enc}>1{Survival \arabic{enc}, Vigilance \arabic{enc}}\fi\Path{Divinity (Qualme)}{Fate \arabic{enc} Invocation \addtocounter{enc}{1}\arabic{enc}, Necromancy \arabic{age}}}{Dagger}{\mana{4}}
-		}
+	\randomthree\addtocounter{age}{-1}
+\person{1}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{\arabic{age}\addtocounter{age}{1}}% INTELLIGENCE
+{1}% WITS
+{-2}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Aggression 2, Projectiles \arabic{age}, Academics \arabic{age}, Beast Ken \arabic{age}, Stealth \arabic{enc}, \ifnum\value{enc}>1{Survival \arabic{enc}, Vigilance \arabic{enc}}\fi\Path{Divinity (Qualme)}{Fate \arabic{enc} Invocation \addtocounter{enc}{1}\arabic{enc}, Necromancy \arabic{age}}}% SKILLS
+{Dagger}% EQUIPMENT
+{\mana{4}}
+}
 
-		\newcommand{\nuracat}{
-			\animal{2}{2}{4}{2}{0}{4}{Stealth 2, Survival 1, Vigilance 2\abilities{\claws}}{}{}
+\newcommand{\nuracat}{
+	\animal{2}% STRENGTH
+	{2}% DEXTERITY
+	{4}% SPEED
+	{2}% WITS
+	{0}% DR
+	{4}% AGGRESSION
+	{Stealth 2, Survival 1, Vigilance 2\abilities{\claws}}% SKILLS
+	{}{}
 	}
 
-		\newcommand{\nuracrab}{
-			\randomthree\addtocounter{random}{1}
-\animal{\arabic{random}}{-2}{1}{0}{6}{2}{Survival 1}{}{}
+\newcommand{\nuracrab}{
+\randomthree\addtocounter{random}{1}
+\animal{\arabic{random}}% STRENGTH
+{-2}% DEXTERITY 
+{1}% SPEED
+{0}% WITS
+{6}% DR
+{2}% AGGRESSION
+{Survival 1}% SKILLS
+{}% ABILITIES
+{}
 	}
 
-		\newcommand{\nurahorse}{
-\animal{2}{1}{2}{0}{2}{2}{Athletics 3, Survival 1}{}{}
+	\newcommand{\nurahorse}{
+\animal{2}% STRENGTH
+{1}% DEXTERITY 
+{2}% SPEED
+{0}% WITS
+{2}% DR
+{2}% AGGRESSION
+{Athletics 3, Survival 1}% SKILLS
+{}% ABILITIES
+{}
 	}
 
-		\newcommand{\nuraslug}{
-			\animal{0}{-1}{-4}{0}{1}{0}{Projectiles 2, Survival 1\abilities{Spitting acid for 1D6 Damage}}{}{}
-	}
+\newcommand{\nuraslug}{
+\animal{0}% STRENGTH
+{-1}% DEXTERITY 
+{-4}% SPEED
+{0}% WITS
+{1}% DR
+{0}% AGGRESSION
+{Projectiles 2, Survival 1\abilities{Spitting acid for 1D6 Damage}}% SKILLS
+{}% ABILITIES
+{}
+}
 
-		\newcommand{\nuraspider}{
-			\animal{4}{2}{3}{2}{3}{4}{Athletics 3, Vigilance 2\abilities{\web}}{}{}
-	}
+\newcommand{\nuraspider}{
+\animal{4}% STRENGTH
+{2}% DEXTERITY 
+{3}% SPEED
+{2}% WITS
+{3}% DR
+{4}% AGGRESSION
+{Athletics 3, Vigilance 2}% SKILLS
+{\web, poison}% ABILITIES
+{}
+}
+
+\newcommand{\nurawolf}{
+\animal{1}% STRENGTH
+{1}% DEXTERITY 
+{3}% SPEED
+{1}% WITS
+{2}% DR
+{3}% AGGRESSION
+{Athletics 3, Survival 1}% SKILLS
+{\teeth}% ABILITIES
+{}
+}
 
-		\newcommand{\nurawolf}{
-\animal{1}{1}{3}{1}{2}{3}{Athletics 3, Survival 1}{}{}
-	}
 
 %%%%%%%%%% NURA %%%%%%%%%%
 
 \newcommand{\goblin}{
-	\person{-1}{2}{0}{{-1}{0}{-4}}{0}{1}{Projectiles \ifodd\thechapter 1\else 2\fi, Athletics 1, Deceit 1, Stealth \ifodd\thechapter 2\else 1\fi, Tactics 1}{\javelin dagger}{}
-	}
+\person{-1}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{-1}% INTELLIGENCE
+{0}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Projectiles \ifodd\thechapter 1\else 2\fi, Athletics 1, Deceit 1, Stealth \ifodd\thechapter 2\else 1\fi, Tactics 1}% SKILLS
+{\javelin dagger}% EQUIPMENT
+{}
+}
 
 \newcommand{\undeadgoblin}{
-	\randomtwo\addtocounter{random}{-2}
-	\animal{\arabic{random}}{-2}{0}{-4}{2}{2}{}{}{}
-	}
+\randomtwo\addtocounter{random}{-2}
+\animal{\arabic{random}}% STRENGTH
+{-2}% DEXTERITY 
+{0}% SPEED
+{-4}% WITS
+{2}% DR
+{2}% AGGRESSION
+{}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\deepgoblin}{
-	\randomtwo\addtocounter{random}{-2}
-	\person{\arabic{random}}{2}{0}{{-1}{1}{-4}}{0}{1}{Projectiles 2, Athletics 1, Deceit 1, Stealth 2, Tactics 2}{\javelin bag of rocks}{}
-	}
+\randomtwo\addtocounter{random}{-2}
+\person{\arabic{random}}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{-1}% INTELLIGENCE
+{1}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{1}% AGGRESSION
+{Projectiles 2, Athletics 1, Deceit 1, Stealth 2, Tactics 2}% SKILLS
+{\javelin bag of rocks}% EQUIPMENT
+{}
+}
 
 \newcommand{\goblinnuramancer}{
-	\randomtwo
-	\person{-2}{2}{0}{{\arabic{random}}{3}{-4}}{0}{0}{Projectiles 2, Deceit 2, Medicine 2, Stealth 1, Tactics 2\Path{Nura}{Invocation 3, Necromancy 3, Saurecanta 4}}{\Dagger}{\mana{4}}
-	}
+\randomtwo
+\person{-2}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{3}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{0}% AGGRESSION
+{Projectiles 2, Deceit 2, Medicine 2, Stealth 1, Tactics 2\Path{Nura}{Invocation 3, Necromancy 3, Saurecanta 4}}% SKILLS
+{\Dagger}% EQUIPMENT
+{\mana{4}}
+}
 
 \newcommand{\hobgoblin}{
-	\person{1}{2}{0}{{-3}{0}{-4}}{0}{2}{Crafts 1, Tactics 1}{\shortsword\partialchain}{}
-	}
+\person{1}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{-3}% INTELLIGENCE
+{0}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{2}% AGGRESSION
+{Crafts 1, Tactics 1}% SKILLS
+{\shortsword\partialchain}% EQUIPMENT
+{}
+}
 
 \newcommand{\deephobgoblin}{
-	\person{1}{2}{0}{{-3}{0}{-4}}{0}{2}{Tactics 2}{\club}{}
-	}
+\person{1}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{-3}% INTELLIGENCE
+{0}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{2}% AGGRESSION
+{Tactics 2}% SKILLS
+{\club}% EQUIPMENT
+{}
+}
 
 \newcommand{\undeadhobgoblin}{
-	\animal{1}{0}{-1}{-3}{2}{2}{}{}{}
-	}
+\animal{1}% STRENGTH
+{0}% DEXTERITY 
+{-1}% SPEED
+{-3}% WITS
+{2}% DR
+{2}% AGGRESSION
+{}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\sentientundeadhobgoblin}{
-	\randomtwo
-	\person{\arabic{random}}{-1}{-2}{{1}{0}{-5}}{2}{1}{Aggression 2, Crafts 2, Tactics 1}{None}{}
+\randomtwo
+\person{\arabic{random}}% STRENGTH
+{-1}% DEXTERITY 
+{-2}% SPEED
+{{1}% INTELLIGENCE
+{0}% WITS
+{-5}}% CHARISMA
+{2}% DR
+{1}% AGGRESSION
+{Aggression 2, Crafts 2, Tactics 1}% SKILLS
+{None}% EQUIPMENT
+{}
 }
 
 \newcommand{\ogre}{
 	\randomthree\addtocounter{random}{3}
-	\person{\arabic{random}}{0}{1}{{-3}{-2}{-4}}{0}{2}{Beast Ken 2, Crafts 1, Tactics 1}{\greatclub \ifnumcomp{\thechapter}{>}{8}{, \thepage sp}{}}{}
-	}
+\person{\arabic{random}}% STRENGTH
+{0}% DEXTERITY 
+{1}% SPEED
+{{-3}% INTELLIGENCE
+{-2}% WITS
+{-4}}% CHARISMA
+{0}% DR
+{2}% AGGRESSION
+{Beast Ken 2, Crafts 1, Tactics 1}% SKILLS
+{\greatclub \ifnumcomp{\thechapter}{>}{8}{, \thepage sp}{}}% EQUIPMENT
+{}
+}
 
 \newcommand{\ghoul}{
-	\randomtwo
-	\animal{\arabic{random}}{-2}{-2}{-2}{2}{2}{}{}{}
-	}
+\randomtwo
+\animal{\arabic{random}}% STRENGTH
+{-2}% DEXTERITY 
+{-2}% SPEED
+{-2}% WITS
+{2}% DR
+{2}% AGGRESSION
+{}% STRENGTH
+{}% EQUIPMENT
+{}
+}
 
 \newcommand{\ghoulhobgoblin}{
-	\animal{1}{-2}{-2}{-2}{2}{2}{}{}{}
-	}
+\animal{1}% STRENGTH
+{-2}% DEXTERITY 
+{-2}% SPEED
+{-2}% WITS
+{2}% DR
+{2}% AGGRESSION
+{None}% SKILLS
+{Undead Sight}% ABILITIES
+{}
+}
 
 \newcommand{\ghast}{
-	\randomtwo\addtocounter{enc}{1}
-	\person{\arabic{enc}}{2}{0}{{\arabic{random}}{0}{-5}}{2}{2}{Aggression 2, Beast Ken 1, Survival 1, Tactics \arabic{age}, Vigilance 1}{\greatsword, dagger, %
-	\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{}{\ifnumcomp{\thechapter}{>}{3}{\multiply\value{gold} by \thepage \ifnumcomp{\value{gold}}{>}{0}{\divide\value{gold} by 1000 \ifnumcomp{\value{enc}}{>}{0}{\arabic{enc} sp}{\thepage cp in a small pouch}}{ornamental dagger, worth \thepage sp}}{\thepage gp worth of rubies, sewn across the flesh of the entire body.}}}%
-	{}
-	}
+\randomtwo\addtocounter{enc}{1}
+\person{\arabic{enc}}% STRENGTH
+{2}% DEXTERITY 
+{0}% SPEED
+{{\arabic{random}}% INTELLIGENCE
+{0}% WITS
+{-5}}% CHARISMA
+{2}% DR
+{2}% AGGRESSION
+{Aggression 2, Beast Ken 1, Survival 1, Tactics \arabic{age}, Vigilance 1}% SKILLS
+{\greatsword, dagger, %
+\ifnumcomp{\thechapter}{=}{\value{bestiarychapter}}{}{\ifnumcomp{\thechapter}{>}{3}{\multiply\value{gold} by \thepage \ifnumcomp{\value{gold}}{>}{0}{\divide\value{gold} by 1000 \ifnumcomp{\value{enc}}{>}{0}{\arabic{enc} sp}{\thepage cp in a small pouch}}{ornamental dagger, worth \thepage sp}}{\thepage gp worth of rubies, sewn across the flesh of the entire body.}}}% EQUIPMENT
+{}
+}
 
 \newcommand{\demilich}{
-	\randomtwo
-	\person{\arabic{enc}}{-1}{-2}{{2}{1}{-5}}{2}{1}{Aggression 2, Projectiles 1, Academics 3, Deceit 1, Medicine 2, Vigilance 1\Path{Devotion (Qualme)}{Fate \arabic{enc}, \ifodd\thechapter Invocation 3\else Aldaron \arabic{enc}\fi, Metamagic 3, Necromancy 5}}{\Dagger, mana stone holding 6 MP}{\mana{6}\lockedmana{3}\setcounter{spd}{\value{wts}}}
-	}
+\randomtwo
+\person{\arabic{enc}}% STRENGTH
+{-1}% DEXTERITY 
+{-2}% SPEED
+{{2}% INTELLIGENCE
+{1}% WITS
+{-5}}% CHARISMA
+{2}% DR
+{1}% AGGRESSION
+{Aggression 2, Projectiles 1, Academics 3, Deceit 1, Medicine 2, Vigilance 1\Path{Devotion (Qualme)}{Fate \arabic{enc}, \ifodd\thechapter Invocation 3\else Aldaron \arabic{enc}\fi, Metamagic 3, Necromancy 5}}% SKILLS
+{\Dagger, mana stone holding 6 MP}% EQUIPMENT
+{\mana{6}\lockedmana{3}\setcounter{spd}{\value{wts}}}
+}
 
 \newcommand{\lich}{
-	\person{1}{-2}{-2}{{3}{1}{-5}}{2}{1}{Aggression 2, Projectiles 2, Academics 3, Deceit 2, Medicine 3, Vigilance 2\Path{Devotion (Qualme)}{Aldaron 3, Invocation 3, Metamagic 4, Necromancy 5}}{\Dagger, embalmed hand of a king; capable of dealing $1D6+3$ direct HP Damage to anyone who strike the lich.}{\mana{6}\lockedmana{3}\setcounter{spd}{\value{wts}}}
-	}
+\person{1}% STRENGTH
+{-2}% DEXTERITY 
+{-2}% SPEED
+{{3}% INTELLIGENCE
+{1}% WITS
+{-5}}% CHARISMA
+{2}% DR
+{1}% AGGRESSION
+{Aggression 2, Projectiles 2, Academics 3, Deceit 2, Medicine 3, Vigilance 2\Path{Devotion (Qualme)}{Aldaron 3, Invocation 3, Metamagic 4, Necromancy 5}}% SKILLS
+{\Dagger, embalmed hand of a king; capable of dealing $1D6+3$ direct HP Damage to anyone who strike the lich.}% EQUIPMENT
+{\mana{6}\lockedmana{3}\setcounter{spd}{\value{wts}}}
+}
 
 \newcommand{\jelly}{
-	\animal{-1}{2}{-2}{-3}{3}{2}{Stealth 2, \unstoppable}{Acidic damage, gelanonous}{\addtocounter{xpbonus}{2}}
-	}
+\animal{-1}% STRENGTH
+{2}% DEXTERITY 
+{-2}% SPEED
+{-3}% WITS
+{3}% DR
+{2}% AGGRESSION
+{Stealth 2, \knacks{\unstoppable}}% SKILLS
+{Acidic damage, gelanonous}% ABILITIES
+{\addtocounter{xpbonus}{2}}
+}
 
 \newcommand{\umberhulk}{
 	\randomtwo\addtocounter{enc}{4}
-	\animal{\arabic{enc}}{\ifodd\thechapter -1\else 0\fi\randomtwo }{1}{1}{5}{2}{Stealth 1, Survival \arabic{enc}, Vigilance 1}{}{}
-	}
+\animal{\arabic{enc}}% STRENGTH
+{\ifodd\thechapter -1\else 0\fi\randomtwo }% DEXTERITY 
+{1}% SPEED
+{1}% WITS
+{5}% DR
+{2}% AGGRESSION
+{Stealth 1, Survival \arabic{enc}, Vigilance 1}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\horse}{
-	\animal{2}{0}{4}{1}{1}{0}{Athletics 2, Survival 1}{}{}
-	}
+\animal{2}% STRENGTH
+{0}% DEXTERITY 
+{4}% SPEED
+{1}% WITS
+{1}% DR
+{0}% AGGRESSION
+{Athletics 2, Survival 1}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\warhorse}{
-	\animal{3}{0}{4}{1}{1}{1}{Athletics 2, Survival 2, Vigilance 1}{}{}
-	}
+\animal{3}% STRENGTH
+{0}% DEXTERITY 
+{4}% SPEED
+{1}% WITS
+{1}% DR
+{1}% AGGRESSION
+{Athletics 2, Survival 2, Vigilance 1}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\huntingdog}{
-	\animal{-2}{0}{4}{1}{1}{0}{Survival 2\abilities{\teeth}}{}{}
-	}
+\randomtwo\addtocounter{random}{-2}
+\animal{-2}% STRENGTH
+{\arabic{random}}% DEXTERITY 
+{4}% SPEED
+{1}% WITS
+{1}% DR
+{0}% AGGRESSION
+{Survival 2\abilities{\teeth}}{}% SKILLS
+{}% ABILITIES
+}
 
 \newcommand{\rockman}{
-	\person{6}{0}{-4}{{2}{-4}{1}}{7}{1}{Academics 1, Ether Lore 2, Stealth 3, Vigilance 2}{}{}
-	}
+\randomthree\ifodd\value{page}\addtocounter{age}{3}\else\addtocounter{age}{4}\setcounter{enc}{-1}\addtocounter{enc}{-\value{random}}
+\person{\arabic{age}}% STRENGTH
+{0}% DEXTERITY
+{\arabic{enc}}% SPEED
+{{\arabic{age}}% INTELLIGENCE
+{-4}% WITS
+{1}}% CHARISMA
+{7}% DR
+{1}% AGGRESSION
+{Academics 1, Ether Lore 2, Stealth 3, Vigilance 2}% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\lavaman}{
-	\person{7}{0}{0}{{-3}{-5}{-3}}{7}{2}{Crafts 1, Deceit 1, Ether Lore 1, }{}{}
-	}
+\person{7}% STRENGTH
+{0}% DEXTERITY 
+{0}% SPEED
+{{-3}% INTELLIGENCE
+{-5}% WITS
+{-3}}% CHARISMA
+{7}% DR
+{2}% AGGRESSION
+{Crafts 1, Deceit 1, Ether Lore 1, }% SKILLS
+{}% ABILITIES
+{}
+}
 
 \newcommand{\archmage}{
 	\randomtwo\addtocounter{enc}{3}\randomthree
-	\person{-5}{-2}{-3}{{\arabic{enc}}{4}{-5}}{0}{0}{Projectiles \arabic{age}, Academics 3, Deceit \arabic{age}, Ether Lore \addtocounter{enc}{-1}\arabic{enc}, Tactics \arabic{age}\Path{Divinity}{Force \arabic{age}, Illusion 3, Invocation 5, Conjuration 4, Metamagic \addtocounter{enc}{1}\arabic{enc}}}{None}{\addtocounter{sp}{20}\mana{8}\addtocounter{xpbonus}{4}}
-	}
+\person{-5}% STRENGTH
+{-2}% DEXTERITY 
+{-3}% SPEED
+{{\arabic{enc}}% INTELLIGENCE
+{4}% WITS
+{-5}}% CHARISMA
+{0}% DR
+{0}% AGGRESSION
+{Projectiles \arabic{age}, Academics 3, Deceit \arabic{age}, Ether Lore \addtocounter{enc}{-1}\arabic{enc}, Tactics \arabic{age}\Path{Divinity}{Force \arabic{age}, Illusion 3, Invocation 5, Conjuration 4, Metamagic \addtocounter{enc}{1}\arabic{enc}}}% SKILLS
+{None}% ABILITIES
+{\addtocounter{sp}{20}\mana{8}\addtocounter{xpbonus}{4}}
+}
 
 \newcommand{\watcher}{
-	\animal{-3}{-2}{-2}{2}{0}{0}{Stealth 3, Vigilance 2\abilities{Gas}}{}{}
-	}
+\animal{-3}% STRENGTH
+{-2}% DEXTERITY 
+{-2}% SPEED
+{2}% WITS
+{0}% DR
+{0}% AGGRESSION
+{Stealth 3, Vigilance 2\abilities{Gas}}% SKILLS
+{}% ABILITIES
+{}
+}
 
diff --git a/preamble.tex b/preamble.tex
index 21aaddd8ac4b967eb0d4c00e10138082a5df2725..222b765185a15500234bd92497f27dcf47e9f4e2 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -1,4 +1,6 @@
 \usepackage[latin1]{inputenc}
+\usepackage{stmaryrd} % For boxy Maths symbols
+\usepackage{wasysym} % for circly Maths symbols
 \usepackage{appendix}
 \usepackage{geometry}
 \usepackage{array}
@@ -121,7 +123,15 @@
 		}
 
 
-\newcommand{\character}[1]{\needspace{4em}\vspace{.38cm} \normalsize\bfseries\ding{70} #1 \ding{70}\vspace{.18cm}}
+\newcommand{\character}[1]{\needspace{12em}\vspace{.38cm} \normalsize\bfseries\ding{70} #1 \ding{70}\vspace{.18cm}}
+
+\newcommand{\Character}[3]{\needspace{4em}\vspace{.38cm} \normalsize\bfseries\ding{70} #1 \ding{70}
+
+\hspace{.5cm}\textbf{Personality:} #2
+
+\hspace{.5cm}\textbf{Mannerism:} #3
+
+}
 
 \newcommand{\monster}[1]{\needspace{4em}\vspace{.38cm} \normalsize\bfseries\ding{70} #1 \ding{70}\vspace{.18cm}}
 
@@ -205,7 +215,8 @@ Roll & Result \\
 \newcounter{random}
 
 \newcommand{\random}{
-		\addtocounter{random}{\thepage}
+	\addtocounter{random}{\value{page}}\addtocounter{random}{1}
+	\multiply\value{random} by \value{chapter}
 	\whileboolexpr{
 		test {\ifnumcomp{\value{random}}{>}{10}}
 	}
diff --git a/script.sh b/script.sh
new file mode 100755
index 0000000000000000000000000000000000000000..417af6bfc06c5d18135c6f372cc7c0451b8801b6
--- /dev/null
+++ b/script.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Don't run this script unless you know what you're doing.
+
+git checkout master
+for i in gr aie aif fb
+do
+	git merge $i
+	git checkout $i
+	git merge master
+	git checkout master
+done
+
+git checkout master