diff --git a/config/monsters.tex b/config/monsters.tex
index b4e5871938e909c677147985bf6a9324baf8e0dd..a176271d7720c0bf6764e51067a81017245d1f08 100644
--- a/config/monsters.tex
+++ b/config/monsters.tex
@@ -1110,19 +1110,21 @@
 	#1
 	\randomtwo
 	\randomthree
+	\addtocounter{age}{-1}
 	\randomthreeB
-	\addtocounter{enc}{-1}
+	\randomfour
+	\randomdozen
 \person{1}% STRENGTH
 {\arabic{r3b}}% DEXTERITY 
 {\arabic{r2b}}% SPEED
-{{\arabic{enc}}% INTELLIGENCE
+{{\arabic{age}}% INTELLIGENCE
 {1}% WITS
 {\arabic{r3}}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{Academics \ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Deceit \ifodd\thepage 2 \else 1\fi, Performance \ifodd\thechapter 2 \else 1\fi%
+{Academics \ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Empathy \arabic{r3}, Deceit \ifodd\thepage 2 \else 1\fi, Performance \ifodd\thechapter 2 \else 1\fi%
 \ifnumcomp{\value{r12}}{>}{9}{%
-\Path{Song}{Fate \arabic{r3}, Illusion \arabic{r3b}} }{}
+\Path{Song}{\ifodd\value{r3} Fate \else Aldaron \fi\arabic{r3b}, \ifodd\value{r3b} Enchantment \arabic{r4}, \fi \ifodd\thepage Illusion \arabic{r3b}\fi} }{}
 }% SKILLS
 {\ifodd\value{r3}\rapier%
 	\else%
diff --git a/config/preamble.tex b/config/preamble.tex
index 68ef08d586bec70e199c7b96c221d412203492c7..277c848b417e0bf11f07b3dbe162730b4b1de125 100644
--- a/config/preamble.tex
+++ b/config/preamble.tex
@@ -345,11 +345,8 @@ Roll & Result \\
 }
 
 \newcommand{\randomdozen}{%
-\randomthree%
-\randomfour%
-\setcounter{r12}{1}%
-\multiply\value{age}by\value{r4}%
-\addtocounter{r12}{\value{age}}%
+\ifnum\value{r12}>12\setcounter{r12}{2}\fi%
+\ifnum\value{age}>0\addtocounter{r12}{\value{age}}\else\addtocounter{r12}{\value{r4}}\fi%
 }
 
 \newcommand{\mapentry}[1]{\addtocounter{list}{1}\subsubsection{\arabic{list}: #1}}