diff --git a/monsters.sty b/monsters.sty
index e3f684f27e909ba8897b0318a8c93dd8677be953..5a38c2758131f28c5e334b21a78597293b5a33ef 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -514,20 +514,24 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 	\randomthree\addtocounter{age}{-2}
 	\randomtwo
 	\addtocounter{enc}{1}
-\person{\arabic{enc}}% STRENGTH
-{0}% DEXTERITY 
-{0}% SPEED
-{{\arabic{age}}% INTELLIGENCE
-{-1}% WITS
-{\ifodd \value{page} -1\else1\fi}}% CHARISMA
-{0}% DR
-{\ifodd\value{r2} 0\else 1\fi}% COMBAT
-{\ifodd\value{r3c}\else Projectiles 1, \fi Crafts~\arabic{r2b}, \ifodd\value{r4} Empathy~1, Wyldcrafting~\arabic{r2}\fi
-}% SKILLS
-{\Dagger, \lootSmall}% EQUIPMENT
-{
-  \knacks{\specialist{animal husbandry}}
-}
+  \person{\arabic{enc}}% STRENGTH
+  {0}% DEXTERITY 
+  {0}% SPEED
+  {{\arabic{age}}% INTELLIGENCE
+  {-1}% WITS
+  {\ifodd \value{page} -1\else1\fi}}% CHARISMA
+  {0}% DR
+  {\ifodd\value{r2} 0\else 1\fi}% COMBAT
+  {Crafts~\arabic{r2b}, \ifodd\value{r4} Empathy~1\fi
+  }% SKILLS
+  {\Dagger, \lootSmall}% EQUIPMENT
+  {
+    \knacks{\specialist{animal husbandry}}
+    \setcounter{Wyldcrafting}{\value{r2}}
+    \ifodd\value{r3c}\else
+      \setcounter{Projectiles}{1}
+    \fi
+  }
 }
 
 \newcommand{\humanmaid}[1][\npc{\Hu\F}{Maid}]{
@@ -895,11 +899,11 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 
 \newcommand{\gnollshaman}[1][\npc{\Nl\F}{Gnoll Shaman}]{
 	#1
-	\addtocounter{age}{-2}
 	\randomtwo
 	\randomtwoB
 	\randomtwoD
 	\randomthree
+    \addtocounter{age}{-2}
 	\randomthreeB
 	\randomthreeC
 	\randomfour
@@ -916,17 +920,14 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 \ifnum\value{r4}>1%
 	{Vigilance~\arabic{enc}, Wyldcrafting~\arabic{enc}}%
 	\fi%
-  \Path{
-    \ifodd\value{r2}%
-      Air\else Fire%
-    \fi~\arabic{r3}, %
-    \ifodd\value{r3b}\else%
-      Fate~\arabic{r2d}, Water 1%
-    \fi%
-  }
 }% SKILLS
 {\Dagger\ifodd\value{r3}\else, \lootMagic\fi}% EQUIPMENT
-{}
+{
+  \setcounter{Fate}{2}
+  \ifodd\value{r3c}
+    \setcounter{Air}{\value{r2b}}
+  \fi
+}
 }
 
 \newcommand{\nuracat}[1][\npc{\A\N}{Nura Cat}]{
@@ -1188,16 +1189,17 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 {0}% DR
 {\arabic{age}}% AGGRESSION
 {Projectiles~\arabic{r2}, \ifodd\value{r3} Deceit\else Athletics\fi~\arabic{r3}, Medicine~\arabic{r2}, Stealth~1, Tactics~2
-  \Path{
-    Earth~\arabic{r2}, Water~\arabic{r2b}
-  }
 }% SKILLS
 {\Dagger\ifodd\value{r4}, torch\fi%
 \ifnum\value{r4b}=4%
 	, \lootMagic
 \fi%
 }% EQUIPMENT
-{}
+{
+  \setcounter{mp}{3}
+  \setcounter{Earth}{\value{age}}
+  \setcounter{Fire}{2}
+}
 }
 
 \newcommand{\hobgoblin}[1][\npc{\T[\arabic{r12}]\N}{\arabic{r12} Hobgoblins}]{
diff --git a/stats.sty b/stats.sty
index 52d88fac3c7a2d83b07ddd967404d45a4e9936bf..632b225c487320c65ce6017617e0e6a90f6282f8 100644
--- a/stats.sty
+++ b/stats.sty
@@ -281,7 +281,6 @@
 
 % magic
 \newcommand{\magicPath}{}
-\newcommand{\mana}[1]{\setcounter{mp}{#1}}
 \newcommand{\aldaron}{\addtocounter{mp}{3}Aldaron}
 \newcommand{\conjuration}{\addtocounter{mp}{3}Conjuration}
 \newcommand{\enchantment}{\addtocounter{mp}{3}Enchantment}
@@ -577,8 +576,11 @@
   \afterparnoindent
 }
 
+
 \newcommand{\clean}{
   \knacks{}
+  \foreach \s in {Earth,Air,Fate,Fire,Water,Projectiles,Combat,Brawl,Academics,Athletics,Caving,Crafts,Deceit,Empathy,Medicine,Performance,Larceny,Seafaring,Tactics,Vigilance,Wyldcrafting}%
+    {\setcounter{\s}{0}}
   \setcounter{dr}{0}
 	\setcounter{fp}{0}
 	\setcounter{sp}{0}
@@ -627,36 +629,45 @@
 
 \newcommand\skillsEtc{
 
-\begin{tabularx}{\linewidth}{p{.20\textwidth}>{\raggedright\arraybackslash}p{.70\textwidth}}
+  \foreach\s in {Air,Earth,Fate,Fire,Water}%
+    {\ifnum\value{\s}>0\addtocounter{mp}{3}\fi}%
+
+  \begin{tabularx}{\linewidth}{p{.20\textwidth}>{\raggedright\arraybackslash}p{.70\textwidth}}
+
+    \iftoggle{verbose}{
+      \ent{Skills} &
+      \foreach \s in {Earth,Air,Fire,Water,Fate,Projectiles,Combat,Brawl,Academics,Athletics,Caving,Crafts,Deceit,Empathy,Medicine,Performance,Larceny,Seafaring,Tactics,Vigilance,Wyldcrafting}
+        {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi}
+        \skills \\
+    }{}
 
-  \iftoggle{verbose}{
-    \ent{Skills} &
-    \ifnumcomp{\value{att}}{=}{0}{}%
-      {\iftoggle{mind}%
-        {Combat \arabic{att}, }%
-        {Brawl \arabic{att}, }
-      }
-      \skills \\
-  }{}
 
     \ifdefempty{\showKnacks}{}{
-      \ent{Knacks:} & \showKnacks \\
+      \ent{Knacks:} & \showKnacks
+      \\
     }
 
-	\iftoggle{mind}%
-    {%
-    \ifdefempty{\equipment}{}
-    {
-      \ent{Equipment} & \equipment \\
-    }
-    }%
-    {}
+    \ifnum\value{mp}>0
+      \ent{Spheres:} &
+      \foreach \s in {Air,Earth,Fate,Fire,Water}%
+        {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi}
+      \\
+    \fi
+
+    \iftoggle{mind}%
+      {%
+      \ifdefempty{\equipment}{}
+      {
+        \ent{Equipment} & \equipment \\
+      }
+      }%
+      {}
 
-  \ifdefempty{\abilities}{}%
-    {\ent{Abilities:} & \abilities}
-	\mods
+    \ifdefempty{\abilities}{}%
+      {\ent{Abilities:} & \abilities}
+    \mods
 
-\end{tabularx}
+  \end{tabularx}
 
 }
 
@@ -712,7 +723,6 @@
     }{}%
   \addtocounter{hp}{6}%
   \ifnum\value{mp}>0%
-    \addtocounter{mp}{\value{int}}%
     \setcounter{mpFree}{\value{mp}}
     \addtocounter{mpFree}{-\value{mpLocked}}%
   \fi%