diff --git a/config/glossary.tex b/config/glossary.tex
index fd387f3b84f96a235614f0d2971738f3c0df0193..079a7024f47ac2b8fd1685250ac023b9175c0921 100644
--- a/config/glossary.tex
+++ b/config/glossary.tex
@@ -333,7 +333,14 @@
 	description={Captain of the Gnolls' Guild at Keliesend}
 	}
 
-%%%%% Adventures in Whiteland
+%%%%% 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},
@@ -347,7 +354,7 @@
 	}
 
 \newglossaryentry{deanconjuration}{
-	name={The Dean of Conjuration},
+	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}
@@ -355,13 +362,13 @@
 
 \newglossaryentry{deanforce}{
 	name={The Dean of Forces},
-	description={Derren Arthur},
+	description={Derren Kisha},
 	text={the Dean of Forces},
-	first={Derren Arthur, the Dean of Forces}
+	first={Derren Kisha, the Dean of Forces}
 	}
 
 \newglossaryentry{deanmetamagic}{
-	name={The Dean of Metamagics},
+	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}
@@ -369,9 +376,9 @@
 
 \newglossaryentry{deaninvocation}{
 	name={The Dean of Invocation},
-	description={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},
+	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 Beard, the Dean of Invocation}
+	first={Adrian Stein, the Dean of Invocation}
 	}
 
 \newglossaryentry{moore}{
@@ -382,16 +389,45 @@
 	}
 
 \newglossaryentry{prefforce}{
-	name={Prefect Sailon Quennome},
-	description={a sly man from the Quennome region whose elven grandmother has left him noticeably shorter than the other students},
+	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 Quennome}
+	first={Sailon Alisa}
 	}
 
 \newglossaryentry{prefconjuration}{
-	name={Prefect Dane Arthur},
+	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}
+	}
+
+
diff --git a/config/monsters.tex b/config/monsters.tex
index d1b2b3d62d44ca1472cae6002600c30489554091..5e7a08b3687b3a994eaddbc3383f272079a5b1a8 100644
--- a/config/monsters.tex
+++ b/config/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}
@@ -390,7 +391,7 @@
 
 
 \newcommand{\auroch}{
-	\animal{2}% STRENGTH
+\animal{2}% STRENGTH
 {-2}% DEXTERITY 
 {3}% SPEED
 {1}% WITS
@@ -402,7 +403,7 @@
 }
 
 \newcommand{\bear}{
-	\animal{5}% STRENGTH
+\animal{5}% STRENGTH
 {-1}% DEXTERITY 
 {4}% SPEED
 {0}% WITS
@@ -509,8 +510,18 @@
 	}
 
 \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{chapter} 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}{
@@ -531,12 +542,22 @@
 	}
 
 \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