diff --git a/config/monsters.tex b/config/monsters.tex
index 6291a2874cf77599f468a4d6bc9585f7c0b9d031..eb0a992be647b44a193a41e613e87f49e35ca834 100644
--- a/config/monsters.tex
+++ b/config/monsters.tex
@@ -30,7 +30,7 @@
 
 \newcommand{\lootMagic}{%
 \iftoggle{bestiarychapter}{}%
-	{\ifnumcomp{\value{r2}}{>}{1}{%
+	{\iftoggle{team}{}{\ifnumcomp{\value{r2}}{>}{1}{%
 		\ifodd\value{r3}%
 			\ifodd\value{r4}%
 				\ifodd\value{r3b}%
@@ -53,14 +53,14 @@
 			\fi%
 			\else%
 			\ifodd\value{r2b}%
-				\ifodd\value{r2b}%
+				\ifnum\value{dr}>0%
 					Ring of Asphyxiation\else%
 					Ghost Shield%
 				\fi%
 			\else%
 				Bag of Tricks%
 			\fi%
-		\fi}}}
+		\fi}}}}
 
 \newcommand{\lootJewellery}{%
 \iftoggle{bestiarychapter}{jewellery worth \ifodd\value{r2}$3D6$sp\else$1D6+2$gp\fi}%
@@ -366,6 +366,7 @@
 	\setcounter{mp}{0}
 	\setcounter{mpb}{0}
 	\setcounter{xpbonus}{0}
+	\settoggle{team}{false}
 
 }
 
@@ -1225,7 +1226,7 @@
 	{Survival \arabic{enc}, Vigilance \arabic{enc}}%
 	\fi%
 \Path{Divinity (Qualm\"e)}{\ifodd\value{r2} Fate\else Aldaron \fi \arabic{r3}, \ifodd\value{r3b}\else Enchantment \arabic{r3}, \fi Necromancy \arabic{r3b}}}% SKILLS
-{\Dagger}% EQUIPMENT
+{\Dagger\ifodd\value{r3}\else, \lootMagic\fi}% EQUIPMENT
 {\mana{4}}
 }
 
@@ -1374,15 +1375,17 @@
 
 \newcommand{\undeadgoblin}[1][\npc{\D\T}{\arabic{r12} Undead Hobgoblins}]{
 	#1
-\randomtwo\addtocounter{enc}{-2}
+	\randomtwo\addtocounter{enc}{-2}
+	\randomtwoB
+	\addtocounter{r2b}{-1}
 \animal{\arabic{enc}}% STRENGTH
 {-2}% DEXTERITY 
-{1}% SPEED
+{\arabic{r2b}}% SPEED
 {-4}% WITS
 {2}% DR
 {2}% AGGRESSION
 {}% SKILLS
-{}% ABILITIES
+{Undead}% ABILITIES
 {}
 }
 
@@ -1408,6 +1411,7 @@
 	#1
 	\randomtwo
 	\randomthree
+	\addtocounter{age}{-1}
 	\randomthreeB
 \person{-2}% STRENGTH
 {\arabic{r3}}% DEXTERITY 
@@ -1416,8 +1420,8 @@
 {0}% WITS
 {-4}}% CHARISMA
 {0}% DR
-{0}% AGGRESSION
-{Projectiles \arabic{r2}, Deceit \arabic{r3}, Medicine \arabic{r2}, Stealth 1, Tactics 2
+{\arabic{age}}% AGGRESSION
+{Projectiles \arabic{r2}, \ifodd\value{r3} Deceit \else Athletics \fi \arabic{r3}, Medicine \arabic{r2}, Stealth 1, Tactics 2
 \Path{Nura}{Invocation \arabic{r3}, Necromancy \arabic{r3b}, Saurecanta \arabic{r4}}}% SKILLS
 {\Dagger}% EQUIPMENT
 {\mana{4}}
@@ -1569,7 +1573,7 @@
 \else%
 	\greatsword, dagger%
 	\ifodd\value{r4}%
-		\partialchain%
+		, \partialchain%
 	\fi%
 \fi%
 \ifodd\thepage, \lootJewellery\fi}% EQUIPMENT
@@ -1582,6 +1586,8 @@
 	\addtocounter{enc}{1}
 	\randomtwoB
 	\addtocounter{r2b}{-1}
+	\randomthree
+	\randomfour
 \person{\arabic{r2}}% STRENGTH
 {0}% DEXTERITY 
 {\arabic{r2b}}% SPEED
@@ -1592,8 +1598,17 @@
 {\arabic{r2}}% COMBAT
 {Aggression 2, Projectiles \arabic{r2}, Academics \arabic{r3}, Deceit 1, Medicine \arabic{r2b}, Vigilance \arabic{r2}
 \Path{Devotion (Qualm\"e)}{\ifodd\value{r4} Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r2} Enchantment \arabic{r3}\else \fi, Necromancy 4}}% SKILLS
-{\Dagger, mana stone holding 6 MP, \ifodd\thechapter\lootJewellery\fi}% EQUIPMENT
-{\mana{6}\setcounter{spd}{\value{wts}}}
+{\ifodd\thepage%
+	\Dagger%
+\else%
+	\shortsword%
+	\ifodd\value{r3b}%
+		, \partialleather%
+	\fi%
+\fi%
+, \multiply\value{track} by 2%
+mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIPMENT
+{\mana{6}\lockedmana{\value{r4}}}
 }
 
 \newcommand{\demilich}[1][\npc{\D\E}{Demilich}]{
@@ -1603,6 +1618,7 @@
 	\randomtwoB
 	\randomthree
 	\addtocounter{age}{-2}
+	\randomfour
 \person{\arabic{r2}}% STRENGTH
 {\arabic{age}}% DEXTERITY 
 {-2}% SPEED
@@ -1623,8 +1639,9 @@
 	\else%
 		\completechain%
 	\fi%
-, mana stone holding 6 MP, \ifodd\thepage\lootMagic, \fi\ifodd\thechapter\lootJewellery\else\lootBig\fi}% EQUIPMENT
-{\mana{6}}
+\multiply\value{track} by 2%
+, mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
+{\mana{6}\lockedmana{\value{r4}}}
 }
 
 \newcommand{\lich}[1][\npc{\D}{Lich}]{
@@ -1655,8 +1672,9 @@
 	\fi%
 \else%
 	\Dagger%
-\fi, \lootMagic, \lootJewellery, \randomtwo\lootJewellery}% EQUIPMENT
-{\mana{6}\lockedmana{3}}
+\fi, \multiply\value{track} by 2%
+, mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
+{\mana{8}\lockedmana{\value{r4}}}
 }
 
 \newcommand{\jelly}[1][\npc{\A}{\ifnum\value{r4}>3 Black\else \ifnum\value{r4}>2 Red \else \ifnum\value{r4}>1 Brown\else Invisible\fi\fi\fi~ Ooze}]{
@@ -1830,11 +1848,12 @@
 \newcommand{\watcher}[1][\npc{\A}{Watcher}]{
 	#1
 	\randomthree
-\animal{-3}% STRENGTH
+	\addtocounter{age}{-3}
+\animal{\arabic{age}}% STRENGTH
 {-2}% DEXTERITY 
 {-2}% SPEED
 {\arabic{r3}}% WITS
-{0}% DR
+{3}% DR
 {0}% AGGRESSION
 {Stealth 3, Vigilance 2}% SKILLS
 {Gas}% ABILITIES
diff --git a/config/preamble.tex b/config/preamble.tex
index 5cfbabfc847c58a4f13410998aad3fc630209306..f9f1dfd3dc30382240ab7d1f3bcafdbcd86a2b6c 100644
--- a/config/preamble.tex
+++ b/config/preamble.tex
@@ -171,7 +171,7 @@ bookmarks=true]%
 \renewcommand{\mannerism}{#4}
 \renewcommand{\archetype}{#5}
 }
-\newcommand{\T}{\opposition} % groups
+\newcommand{\T}{\opposition\settoggle{team}{false}} % groups
 \newcommand{\M}{\mars} % male
 \newcommand{\F}{\venus} % female
 \newcommand{\E}{\mercury} % blood casters
@@ -188,6 +188,10 @@ bookmarks=true]%
 \newtoggle{personality}
 \settoggle{personality}{false}
 
+% This toggle tells you if this is just one creature or a team.
+\newtoggle{team}
+\settoggle{team}{false}
+
 \iftoggle{verbose}{
 	\setcounter{tocdepth}{1}
 	\setcounter{secnumdepth}{1}
@@ -200,11 +204,12 @@ bookmarks=true]%
 \newcounter{r3}
 \setcounter{r3}{2}
 \newcounter{r3b}
-\setcounter{r3}{3}
+\setcounter{r3}{\month}
+\divide\value{r3} by 4
 \newcounter{r4}
-\setcounter{r4}{3}
+\setcounter{r4}{\day}
 \newcounter{r12}
-\setcounter{r12}{9}
+\setcounter{r12}{\month}
 \newcounter{enc}
 \newcounter{list}
 \newcounter{spelllevel}
@@ -331,6 +336,7 @@ Roll & Result \\
 \newcommand{\randomthree}{%
 	\ifnumcomp{\value{r3}}{>}{2}{\setcounter{r3}{1}}{\addtocounter{r3}{1}}%
 	\setcounter{age}{\value{r3}}%
+	\ifnum\value{r3}<1\setcounter{r3}{2}\fi%
 }
 
 \newcommand{\randomthreeB}{