diff --git a/monsters.tex b/monsters.tex
index 43853456a52d15593f9ba70fedfb2d3edb32b11c..df2495b93053fa311cc18d64193da335765980a0 100644
--- a/monsters.tex
+++ b/monsters.tex
@@ -362,7 +362,7 @@
 %%%%%%%%%%%%%%%%%%%% Creature Abilities
 
 \newcommand{\abilities}[1]{ \\
-	\ent{Abilities} & #1 
+	\ent{Abilities:} & #1 
 	}
 
 	\newcommand{\teeth}{Teeth (+1 Damage) \addtocounter{str}{1}
@@ -407,7 +407,7 @@
 }
 %
 \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}{-2}{\ifodd\value{page} 2\else 1\fi}{2}{0}{2}{Athletics 2, Survival 1\knacks{\charge}}{Flight}{}
 }
 %
 \newcommand{\mouthdigger}{
@@ -430,24 +430,38 @@
 
 %
 \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}}{}
+	\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}}{}
 	}
 %
 \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}{