diff --git a/.gitignore b/.gitignore
index 6d1b2c767426d92884db5abc1ea4720f3548095c..64ef7163ebdf4c0094e7b8999bfee3c8d64d96b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ svg-inkscape
 *.ptc
 old
 *.png
-*.jpg
 *.jpeg
 *.tiff
 *.xcf
diff --git a/Makefile b/Makefile
index 2926c4d624c515ddbf6b5bb02207a2cbb5f6b69a..ca0f349b49a14b0ea5c8eb3d3c210a2dd47dccfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 filename=example
 output: ${filename}.pdf
-	pdflatex ${filename}.tex
-${filename}.pdf:
+${filename}.pdf: ${filename}.tex bind.sty monsters.sty
 	pdflatex ${filename}.tex
 new:
 	if [ ! -d .git ] && [ -e ../.git ]
@@ -9,4 +8,4 @@ new:
 		cp -n main.tex .gitignore ..
 	fi
 clean:
-	rm -r *.{aux,toc,acn,acr,log,ptc,out,idx,ist,alg,glo} 2>/dev/null
+	rm -r *.{pdf,aux,toc,acn,acr,log,ptc,out,idx,ist,alg,glo} 2>/dev/null
diff --git a/bind.sty b/bind.sty
index fd524777db9bf97466de9d9a1057b1354b228998..3c98cef71ed0f340926686ea8cf445283a73dd9e 100644
--- a/bind.sty
+++ b/bind.sty
@@ -1,6 +1,8 @@
 \ProvidesPackage{bind}
-\RequirePackage{glossaries}
+\RequirePackage[acronym]{glossaries}
+\setacronymstyle{short-long-desc}
 \RequirePackage{glossary-mcols}
+\RequirePackage{glossaries-extra}
 \RequirePackage{gfsartemisia-euler} % fancy fonts
 \RequirePackage[T1]{fontenc} % 
 \RequirePackage{stmaryrd} % For boxy Maths symbols
@@ -9,6 +11,12 @@
 \RequirePackage{appendix}
 \RequirePackage{geometry} % changes page borders
 	\geometry{margin=50pt}
+\RequirePackage[
+  scale=1,
+  angle=0,
+  opacity=1,
+  contents={}
+]{background}% for fancy borders
 \RequirePackage{svg}
 \RequirePackage{alltt}
 	\svgsetup{width=\textwidth}
@@ -26,12 +34,81 @@
 \RequirePackage{titlesec,titletoc}
 \RequirePackage{needspace}
 \RequirePackage{tikz}
-	\usetikzlibrary{mindmap,trees}
+	\usetikzlibrary{calc,mindmap,trees}% calc for fancy borders
 \RequirePackage{pifont}
 \RequirePackage{colortbl}
 \RequirePackage[poster]{tcolorbox}
 \tcbuselibrary{breakable,raster}
 
+%%%%% Add fancy page chapter sides %%%%%
+\pagestyle{plain}% needed for fancy borders
+\newcounter{chapshift}
+\addtocounter{chapshift}{-1}
+
+\newcounter{pageDarkness}
+\setcounter{pageDarkness}{20}
+
+\newcommand\pageSideColor{%
+	black!\arabic{pageDarkness}%
+}
+
+\newtoggle{sideTab}
+\settoggle{sideTab}{true}
+
+\newcommand\ChapFrame{%
+	\AddEverypageHook{%
+		\iftoggle{sideTab}%
+		{
+		\ifodd\value{page}
+			\backgroundsetup{contents={%
+				\begin{tikzpicture}[overlay,remember picture]
+					\node[
+						fill=\pageSideColor,
+						inner sep=5pt,
+						rectangle,
+						text width=1.2cm,
+						text height=4cm,
+						align=center,
+						anchor=north east
+					]
+			 		at ($ (current page.north east) + (-0cm,-2*\thechapshift cm) $)
+			 		{\rotatebox{90}{\hspace*{.3cm}\parbox[c][1.5cm][t]{3.4cm}{%
+			 		\raggedright\textcolor{white}{\scshape\rightmark}}}};
+				\end{tikzpicture}%
+			}%
+		}
+		\else
+			\backgroundsetup{contents={%
+				\begin{tikzpicture}[overlay,remember picture]
+				\node[
+					fill=\pageSideColor,
+					inner sep=5pt,
+					rectangle,
+					text width=1.2cm,
+					text height=4cm,
+					align=center,
+					anchor=north west
+				]
+				at ($ (current page.north west) + (-0cm,-2*\thechapshift cm) $)
+				{\rotatebox{90}{\hspace*{.3cm}\parbox[c][1.5cm][t]{3.4cm}{%
+					\raggedright\textcolor{white}{\scshape\leftmark}}}};
+				\end{tikzpicture}%
+			}%
+		}
+		\fi
+		}
+		{}%
+	\BgMaterial
+	}%
+	\stepcounter{chapshift}%
+}
+
+% redefinition of \chaptermark to contain only the title
+\renewcommand\chaptermark[1]{\markboth{\thechapter.~#1}{}}
+
+
+%%%%% TColorBox Basic Setup %%%%%
+
 \tcbset{enhanced, drop shadow east,
 colframe=gray,colbacktitle=black!5!white,
 fonttitle=\bfseries,coltitle=black,attach boxed title to top center=
@@ -50,6 +127,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \RequirePackage{xr-hyper}
 \RequirePackage[
 pdfstartpage=2,
+hidelinks=true,
 bookmarks=true]%
 {hyperref}
 
@@ -57,7 +135,7 @@ bookmarks=true]%
 
 \newcommand*{\externalReferent}[1]{
 	\newtoggle{#1}
-	\IfFileExists{../#1/main.tex}{
+	\IfFileExists{../#1/main.aux}{
 		\makeatletter
 		\@addtofilelist{../#1/main.tex}
 		\@addtofilelist{../#1/main.aux}%
@@ -81,6 +159,15 @@ bookmarks=true]%
 \old@endpart}
 \makeatother
 
+%%%%%%%%%% Give higher penalty to ~
+% The ~ character usually functions as a space with a high penalty for line breaks.
+% This stops the line breaks altogether, so we can write 'Athletics 3', without a line-break between the Skill and the number.
+
+\DeclareRobustCommand{\nobreakspace}{%
+   \leavevmode\nobreak\ }
+\catcode `\~=13
+\def~{\nobreakspace{}}
+
 %%%%% Make table of contents two column
 
 \makeatletter
@@ -109,7 +196,7 @@ bookmarks=true]%
 
 
 \newcommand{\chapnumfont}{
-	\fontsize{40}{0}
+	\fontsize{50}{0}
 	\selectfont
 }
 
@@ -129,36 +216,64 @@ bookmarks=true]%
 
 \newcommand{\headingtype}{CHAPTER}
 
+\newcommand{\pic}[1]{
+	\noindent\includesvg[width=\linewidth]{images/#1}
+
+}
+
 \newcommand{\sidepic}[2][5]{
-	\needspace{2cm}\begin{wrapfigure}{O}{.#1\linewidth}
+	\needspace{2cm}\begin{wrapfigure}{R}{.#1\linewidth}
 \noindent\includesvg[width=\linewidth]{images/#2}
 \end{wrapfigure}
 }
 
 \newcommand{\sidejpg}[3][5]{
 	\iftoggle{verbose}{
-		\begin{wrapfigure}{O}{.#1\linewidth}
+		\needspace{12em}%
+		\begin{wrapfigure}{R}{.#1\linewidth}
 			\noindent\includegraphics[width=\linewidth]{images/#2}
 		#3
 	\end{wrapfigure}
 }
+\noindent
+}
+
+\newcommand{\toppic}[2]{
+	\iftoggle{verbose}{
+		\begin{figure*}[t!]
+			\IfFileExists{images/#1.svg}{
+				\includesvg[width=\textwidth]{images/#1}
+			}{
+				\includegraphics[width=\textwidth]{images/#1.jpg}
+			}
+		\end{figure*}
+	}
 }
 
-\colorlet{chapnumcol}{black!55}
+\colorlet{chapnumcol}{black!100}
 
 \newcommand{\FancyFont}{}
 \newcommand{\fancyfont}{}
 
 \titleformat{\chapter}[display]
 {\bfseries}
-{\begin{tikzpicture}
-  \node[minimum width=\textwidth, text=black!25, fill=black!25, inner sep=1, outer sep=0, anchor=south] (rectinit) {\huge CHAPTER};
-  \node[minimum width=.8\textwidth, text=white, inner sep=1, outer sep=0, anchor=south west, text width=.8\textwidth, align=right] at (rectinit.south west) (chapname) {\FancyFont\headingtype~~};
-  \node[minimum width=.2\textwidth, inner sep=0, outer sep=0, anchor=south west, text width=.2\textwidth, align=left] at (chapname.south east) {\chapnumfont\textcolor{chapnumcol}{\Roman{chapter}}};
+{%
+	\ChapFrame
+	\ifnum\value{pageDarkness}<80
+		\addtocounter{pageDarkness}{7}
+	\else
+		\colorlet{chapnumcol}{black!40}
+	\fi
+	\hspace*{-1.5em}
+\begin{tikzpicture}
+  \node[minimum width=\linewidth+3em, text=white, fill=\pageSideColor, inner sep=1, outer sep=0, anchor=south] (rectinit) {\Huge \headingtype};
+ \node[minimum width=.75\textwidth, text=white, inner sep=3, outer sep=0, anchor=south west, text width=.75\textwidth, align=right] at (rectinit.south west) (chapname) {};
+  \node[minimum width=.25\textwidth, inner sep=-5, outer sep=0, anchor=south west, text width=.25\textwidth, align=left] at (chapname.south east) {\chapnumfont\textcolor{chapnumcol}{\Roman{chapter}}};
 \end{tikzpicture}}
 {0pt}
 {\Huge\FancyFont}
 
+
 \titleformat{\section}[frame]
 {\needspace{20em}\normalfont}
 {\filright
@@ -167,7 +282,12 @@ bookmarks=true]%
 {8pt}
 {\Large\bfseries\filcenter\fancyfont}
 
-\titleformat{\subsection}{\needspace{10em}\center\large\bfseries}{}{1em}{}[\rule{.9\linewidth}{.2pt}]
+\titleformat{\subsection}%
+	{\needspace{9em}\center\large\bfseries}%
+	{}%
+	{1em}%
+	{}%
+	[\rule{.9\linewidth}{.2pt}]
 %
 \titleformat{\subsubsection}
 {\needspace{3em}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{}
@@ -195,7 +315,7 @@ bookmarks=true]%
 \renewcommand{\mannerism}{#4}
 \renewcommand{\archetype}{#5}
 }
-\newcommand{\T}{\opposition\settoggle{team}{false}} % groups
+\newcommand{\T}{\opposition\settoggle{team}{true}} % groups
 \newcommand{\M}{\mars} % male
 \newcommand{\F}{\venus} % female
 \newcommand{\E}{\mercury} % blood casters
@@ -221,24 +341,30 @@ bookmarks=true]%
 	\setcounter{secnumdepth}{1}
 }
 
+\newcounter{r4}
+\setcounter{r4}{\day}
+	\whileboolexpr{
+		test {\ifnumcomp{\value{r4}}{>}{4}}
+	}
+	{\addtocounter{r4}{-3}}
+
 \newcounter{r2}
-\setcounter{r2}{1}
+\setcounter{r2}{\value{r4}}
 \newcounter{r2b}
-\setcounter{r2}{2}
+	\setcounter{r2b}{\value{r2}}
+	\addtocounter{r2b}{-1}
 \newcounter{r2c}
 \setcounter{r2c}{2}
 \newcounter{r3}
 \setcounter{r3}{\month}
-\divide\value{r3} by 4
+	\divide\value{r3} by 4
 \newcounter{r3b}
-\setcounter{r3b}{2}
+	\setcounter{r3b}{\value{r4}}
+	\addtocounter{r3b}{-1}
 \newcounter{r3c}
-\setcounter{r3c}{3}
-\newcounter{r4}
-\setcounter{r4}{\day}
+	\setcounter{r3c}{0}
 \newcounter{r4b}
-\setcounter{r4b}{\day}
-\addtocounter{r4b}{1}
+	\setcounter{r4b}{\day}
 \newcounter{r12}
 \setcounter{r12}{\month}
 \newcounter{enc}
@@ -323,14 +449,14 @@ Roll & Result \\
 
 \newtcolorbox[use counter=enc, use counter=list]{encounters}[1]{adjusted title=Encounters in #1,arc=1mm,tabularx={XXp{.6\textwidth}},code={\setcounter{enc}{19}\setcounter{list}{18}}}
 
-\newtcolorbox{rollchart}{tabularx={cp{.7\linewidth}},arc=1mm}
+\newtcolorbox{rollchart}{tabularx={p{.25\linewidth}X},arc=1mm}
 
 \newtcolorbox{xpbox}[1]{tabularx={lc},arc=1mm,equal height group=#1}
 
 
 %%%%%%%%%%%%%%%%%%% COMMANDS %%%%%%%%%%%%%%%%%%%%
 
-\newcommand{\story}[2]{\needspace{2em}\vspace{.3cm}\noindent\textbf{#2\ldots}\par\noindent Cost: #1\par\noindent}
+\newcommand{\story}[2]{\needspace{4em}\vspace{.3cm}\noindent\textbf{#2\ldots}\par\noindent Cost: #1\par\noindent}
 
 \newcommand{\best}[2][\C]{\npc{#1}{#2}\subsubsection{#2}\index{Antagonists!#2}}
 
@@ -375,8 +501,15 @@ Roll & Result \\
 	\ifnum\value{r3}<1\setcounter{r3}{2}\fi%
 }
 
-\newcommand{\randomthreeB}{
-	\ifnumcomp{\value{r3b}}{>}{2}{\setcounter{r3b}{1}}{\addtocounter{r3b}{1}}
+\newcommand{\randomthreeB}{%
+	\ifnum\value{r3b}>2%
+		\setcounter{r3b}{1}%
+	\else%
+		\addtocounter{r3b}{1}%
+	\fi%
+	\ifnum\value{r3b}<1%
+		\setcounter{r3b}{3}
+	\fi%
 }
 
 \newcommand{\randomthreeC}{
@@ -388,7 +521,8 @@ Roll & Result \\
 
 \newcommand{\randomfour}{%
 	\ifnumcomp{\value{r4}}{>}{3}{\setcounter{r4}{1}}{\addtocounter{r4}{1}}%
-	\ifnumcomp{\value{r4}}{<}{1}{\setcounter{r4}{1}}{}\setcounter{track}{\value{r4}}%
+	\ifnumcomp{\value{r4}}{<}{1}{\setcounter{r4}{1}}{}
+	\setcounter{track}{\value{r4}}%
 }
 
 \newcommand{\randomfourB}{%
@@ -399,9 +533,9 @@ Roll & Result \\
 }
 
 \newcommand{\randomdozen}{%
-\ifnum\value{r12}>12\setcounter{r12}{2}\fi%
-\ifnum\value{r12}<4\setcounter{r12}{2}\fi%
-\ifnum\value{age}>0\addtocounter{r12}{\value{age}}\else\ifnum\value{r4}>0\addtocounter{r12}{\value{r4}}\else\addtocounter{r12}{3}\fi\fi%
+	\ifnum\value{r12}>12\setcounter{r12}{2}\fi%
+	\ifnum\value{r12}<4\setcounter{r12}{2}\fi%
+	\ifnum\value{age}>0\addtocounter{r12}{\value{age}}\else\ifnum\value{r4}>0\addtocounter{r12}{\value{r4}}\else\addtocounter{r12}{3}\fi\fi%
 }
 
 \newcommand{\mapentry}[1]{\needspace{2em}\addtocounter{list}{1}\subsubsection{\arabic{list}: #1}}
@@ -476,6 +610,4 @@ Roll & Result \\
 & \ding{111} & \ding{111} & \ding{111} \\
 }
 
-
 \newcommand{\longline}{\line(1,0){340}\par\vspace{.2cm}}
-
diff --git a/example.tex b/example.tex
index d400ddb3103812c1352899b9e1b50c03436422b1..08fd62dd10f202e473f28d0ba49ce0193fe9926e 100644
--- a/example.tex
+++ b/example.tex
@@ -146,6 +146,8 @@ With a little study, you can summon dozens of monsters, including {\tt\textbacks
 
 \subsection{Humanoids}
 
+\goblin[\npc{\N}{Random Goblin}]
+
 \goblin
 
 \goblin
@@ -342,6 +344,16 @@ When using a bestiary chapter, the stats appear as dice rolls, rather than fixed
 \lipsum
 
 
+\end{multicols}
+
+\chapter{Lots More Text}
+
+\begin{multicols}{2}
+
+\noindent
+\lipsum
+
+
 \end{multicols}
 
 \end{document}
diff --git a/monsters.sty b/monsters.sty
index fde24eaeaaf9e9a6540823a808b34da518b84194..40415db23e4c6f3e73b4f2bd4fc805498ecc512a 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -29,38 +29,48 @@
 }
 
 \newcommand{\lootMagic}{%
-\iftoggle{bestiarychapter}{}%
-	{\iftoggle{team}{}{\ifnumcomp{\value{r2}}{>}{1}{%
-		\ifodd\value{r3}%
-			\ifodd\value{r4}%
-				\ifodd\value{r3b}%
-					Townmaster's Hat\else%
-					Deck of Cards%
-				\fi%
+	\iftoggle{team}{%
+		Mana stone holding 2 MP%
+	}{%
+		\iftoggle{bestiarychapter}{}%
+			{\iftoggle{team}{}{\ifnumcomp{\value{r2}}{>}{1}{%
+				\ifodd\value{r3}%
+					\ifodd\value{r4}%
+						\ifodd\value{r3b}%
+							Townmaster's Hat%
+						\else%
+							Deck of Cards%
+						\fi%
+					\else%
+						Wild Seeds\fi%
 				\else%
-				Wild Seeds\fi%
-			\else%
-				\ifodd\value{r2b}%
-					Bag of Holding%
+					\ifodd\value{r2b}%
+						Bag of Holding%
+					\else%
+						Taming Flute%
+					\fi%
+				\fi}%
+				{\ifodd\value{r3}%
+					\ifodd\value{r4}%
+						Portal Scroll%
+					\else%
+						Sleeping Dust%
+					\fi%
 				\else%
-					Taming Flute%
-				\fi%
-			\fi}%
-		{\ifodd\value{r3}%
-			\ifodd\value{r4}%
-				Portal Scroll\else%
-				Sleeping Dust%
-			\fi%
-			\else%
-			\ifodd\value{r2b}%
-				\ifnum\value{dr}>0%
-					Ring of Asphyxiation\else%
-					Ghost Shield%
-				\fi%
-			\else%
-				Bag of Tricks%
-			\fi%
-		\fi}}}}
+					\ifodd\value{r2b}%
+						\ifnum\value{dr}>0%
+							Ring of Asphyxiation%
+						\else%
+							Ghost Shield%
+						\fi%
+					\else%
+						Bag of Tricks%
+					\fi%
+				\fi}
+			}
+		}
+	}
+}
 
 \newcommand{\lootJewellery}{%
 \iftoggle{bestiarychapter}{jewellery worth \ifodd\value{r2}$3D6$sp\else$1D6+2$gp\fi}%
@@ -182,7 +192,7 @@
 \newcommand{\disarm}{Disarm\addtocounter{knacks}{1}\addtocounter{xpbonus}{1}}
 \newcommand{\Defender}{Defender\addtocounter{knacks}{1}\addtocounter{xpbonus}{1}}
 \newcommand{\furiousblows}{Furious Blows\addtocounter{knacks}{1}}
-\newcommand{\firststrike}{First Strike\addtocounter{spdb}{2}\addtocounter{knacks}{1}}
+\newcommand{\firststrike}{First Strike\addtocounter{spd}{1}\addtocounter{spdb}{2}\addtocounter{knacks}{1}}
 \newcommand{\specialist}[1]{Specialist (#1)\addtocounter{knacks}{1}}
 \newcommand{\bloodcaster}{Blood Caster\addtocounter{knacks}{1}}
 \newcommand{\combatcaster}{Combat Caster\addtocounter{knacks}{1}}
@@ -192,7 +202,7 @@
 \newcommand{\precisestrike}{Precise Strike\addtocounter{knacks}{1}}
 \newcommand{\quickshot}{Quick Shot\addtocounter{knacks}{1}}
 \newcommand{\stunningstrike}{Stunning Strike\addtocounter{knacks}{1}\addtocounter{xpbonus}{1}}
-\newcommand{\charge}{\addtocounter{knacks}{1}\setcounter{track}{\value{knacks}}\addtocounter{track}{1}\divide\value{track} by 2\addtocounter{attb}{\value{track}}\addtocounter{strb}{\value{track}}\addtocounter{spdb}{\value{track}}Charge}
+\newcommand{\charge}{\addtocounter{knacks}{1}\setcounter{track}{\value{knacks}}\addtocounter{track}{1}\divide\value{track} by 2\addtocounter{attb}{\value{track}}\addtocounter{strb}{\value{track}}\addtocounter{spdb}{\value{track}}Extreme Charge}
 \newcommand{\snapshot}{Snap Shot\addtocounter{knacks}{1}\addtocounter{strb}{2}}
 \newcommand{\defender}{Defender\addtocounter{knacks}{1}\addtocounter{xpbonus}{1}}
 \newcommand{\dodger}{Dodger\addtocounter{knacks}{1}}
@@ -210,10 +220,10 @@
 \newcommand{\rapier}{Rapier\addtocounter{str}{1}\addtocounter{spd}{2}\addtocounter{dex}{1}}
 \newcommand{\longsword}{Longsword\addtocounter{str}{1}\addtocounter{spd}{1}\addtocounter{dex}{3}}
 \newcommand{\greatsword}{Greatsword\addtocounter{str}{2}\addtocounter{spd}{1}\addtocounter{dex}{2}}
-\newcommand{\spear}{Spear\addtocounter{str}{1}\addtocounter{spd}{1}\addtocounter{dex}{2}\addtocounter{spdb}{\value{knacks}\addtocounter{spdb}{1}}}
+\newcommand{\spear}{Spear\addtocounter{str}{1}\addtocounter{spd}{1}\addtocounter{dex}{2}\addtocounter{spdb}{2}}
 \newcommand{\quarterstaff}{Quarterstaff\addtocounter{spd}{1}\addtocounter{dex}{2}\addtocounter{spdb}{2}}
 \newcommand{\greataxe}{Greataxe\addtocounter{str}{3}\addtocounter{spd}{1}\addtocounter{dex}{1}}
-\newcommand{\woodaxe}{Wood axe\addtocounter{str}{2}\addtocounter{spd}{0}\addtocounter{dex}{1}}
+\newcommand{\woodaxe}{Wood axe\addtocounter{str}{2}\addtocounter{dex}{1}}
 \newcommand{\greatclub}{Greatclub\addtocounter{str}{4}\addtocounter{spd}{1}\addtocounter{dex}{1}}
 \newcommand{\longbow}{Longbow}
 \newcommand{\shield}{\addtocounter{dex}{1}shield}
@@ -304,7 +314,7 @@
 \renewcommand{\armourtype}{P}
 \gdef\armourtype{P}
 
-\begin{tcolorbox}[title={\name},left=2mm,watermark text=\npcsymbol]
+\begin{tcolorbox}[title={\name}, halign=flush left, left=2mm, watermark text=\npcsymbol]
 
 \iftoggle{personality}{
 
@@ -412,7 +422,8 @@
 		\addtocounter{dex}{7}
 }
 \vspace{.1cm}
-\noindent\begin{tabular}{p{.3\textwidth}p{.6\textwidth}}
+\raggedright
+\noindent\begin{tabular}{p{.3\textwidth}>{\raggedright\arraybackslash}p{.65\textwidth}}
 
 	\ent{Skills:} & \ifnumcomp{\value{att}}{=}{0}{\setcounter{att}{-1}}{\iftoggle{mind}{Combat \arabic{att}, }{Aggression \arabic{att}, }} \skills \\
 	\iftoggle{mind}{\ent{Equipment:} & \equipment \\}{\ent{Abilities:} & \abilities \\}
@@ -460,22 +471,36 @@
 \noindent Attack \arabic{att}\ifnumcomp{\value{att}}{=}{\value{attb}}{}{ (\arabic{attb})},
 	Initiative \arabic{spd}\ifnumcomp{\value{spd}}{=}{\value{spdb}}{}{ (\arabic{spdb})},
 	Damage \calculatedamage{\value{str}}\ifnumcomp{\value{str}}{=}{\value{strb}}{}{ (\calculatedamage{\value{strb}})}, 
-	\iftoggle{examplecharacter}{Defence \arabic{dex}, }{
+	\iftoggle{examplecharacter}{\mbox{Defence \arabic{dex},} }{
 	TN \arabic{dex}%
 	\ifnumcomp{\value{dr}}{>}{0}{\ifnum\pdfstrcmp{\armourtype}{P}=0\addtocounter{dexb}{3} (\arabic{dexb})\fi\ifnum\pdfstrcmp{\armourtype}{C}=0\addtocounter{dexb}{5} (\arabic{dexb})\fi}{}, 
 	}%
-	\ifnumcomp{\value{dr}}{>}{0}{DR \arabic{dr} \armourtype,}{} \ifnumcomp{\value{mp}}{>}{0}{\addtocounter{mp}{\value{int}}\ifnumcomp{\value{mpb}}{=}{0}{\arabic{mp} MP}{\addtocounter{mpb}{\value{mp}}\arabic{mpb} / \arabic{mp} MP}%
-	\iftoggle{bestiarychapter}{, }{%
-	\ \Repeat{\value{mp}}{\ding{111}}, %
-	}%
-	}{}\arabic{hp} HP \iftoggle{bestiarychapter}{}{%
+	\ifnumcomp{\value{dr}}{>}{0}{DR \arabic{dr}~\armourtype, }{}%
+	\ifnum\value{mp}>0%
+		\addtocounter{mp}{\value{int}}%
+		\mbox{
+		\ifnum\value{mpb}=0%
+			\arabic{mp}~MP%
+		\else%
+			\addtocounter{mpb}{\value{mp}}%
+			\arabic{mpb} / \arabic{mp} MP%
+		\fi
+		\iftoggle{bestiarychapter}%
+			{, }%
+			{ \Repeat{\value{mp}}{\ding{111}}, }%
+		}
+	\fi
+	\mbox{\arabic{hp} HP \iftoggle{bestiarychapter}{}{%
 	\ \Repeat{\value{hp}}{\ding{111}}%
-	\ifnumcomp{\value{sp}}{>}{0}{, \arabic{sp} SP %
-	\iftoggle{bestiarychapter}{}{\Repeat{\value{sp}}{\ding{111}}}%
-
-}{}%
-
+		}%
 	}%
+	\ifnumcomp{\value{sp}}{>}{0}%
+		{, \mbox{%
+			\arabic{sp} SP %
+			\iftoggle{bestiarychapter}{}{\Repeat{\value{sp}}{\ding{111}}}%
+		}%
+		}%
+	{}%
 \iftoggle{examplecharacter}{\addtocounter{fp}{\value{cha}}, \arabic{fp} FP}{}
 
 
@@ -537,10 +562,11 @@
 %
 \iftoggle{examplecharacter}{%
 }{
-	\iftoggle{mind}{\addtocounter{fp}{\value{cha}} \arabic{fp} FP
-	\iftoggle{bestiarychapter}{}{%
-	\Repeat{\value{fp}}{\ding{111}}%
-	}
+	\iftoggle{mind}%
+		{\addtocounter{fp}{\value{cha}} \arabic{fp} FP %
+		\iftoggle{bestiarychapter}%
+			{}%
+			{\Repeat{\value{fp}}{\ding{111}}}
 }{}
 	\vspace{.1cm}
 	\hrule
@@ -612,7 +638,7 @@
 {0}% WITS
 {2}% DR
 {\arabic{r3b}}% AGGRESSION
-{Athletics \arabic{r2}, Stealth 2, Survival 2, Vigilance 2}% SKILLS
+{Athletics \arabic{r2}, Stealth~2, Survival~2, Vigilance~2}% SKILLS
 {None}% ABILITIES
 {}
 }
@@ -629,7 +655,7 @@
 {\arabic{r2}}% WITS
 {2}% DR
 {2}% AGGRESSION
-{Athletics \arabic{r2}, Survival 1, Vigilance \arabic{r3}}% STRENGTH
+{Athletics~\arabic{r2}, Survival~1, Vigilance~\arabic{r3}}% SKILLS
 {None}% ABILITIES
 {}
 }
@@ -649,7 +675,7 @@
 {\arabic{r4}}% WITS
 {\arabic{enc}}% DR
 {\ifodd\value{r3} 3\else 4\fi}% AGGRESSION
-{Athletics \arabic{r3b}, Survival \arabic{r3}, \ifodd\value{r4} Vigilance \arabic{r3b}\fi}% SKILLS
+{Athletics~\arabic{r3b}, Survival~\arabic{r3}, \ifodd\value{r4} Vigilance~\arabic{r3b}\fi}% SKILLS
 {\web}% ABILITIES
 {}
 }
@@ -716,7 +742,7 @@
 {-5}}% CHARISMA
 {\ifodd\thepage 2\else 3\fi}% DR
 {\arabic{r3}}% AGGRESSION
-{Athletics 2, Stealth \arabic{enc}, Survival \arabic{r2b}, Tactics \arabic{r3}}% SKILLS
+{Athletics~2, Stealth~\arabic{enc}, Survival~\arabic{r2b}, Tactics~\arabic{r3}}% SKILLS
 {None}% ABILITIES
 {}
 }
@@ -737,7 +763,7 @@
 	{\arabic{r2b}}% WITS
 	{4}% DR
 	{\arabic{r3b}}% AGGRESSION
-	{Projectiles \arabic{r2}, Athletics \arabic{r2c}}% SKILLS
+	{Projectiles~\arabic{r2}, Athletics~\arabic{r2c}}% SKILLS
 	{Odour demands Strength check, TN 9. Acidic breath (1D6-2 Damage).}% ABILITIES
 	{\knacks{\unstoppable}}
 }
@@ -747,6 +773,8 @@
 	#1
 	\randomtwo
 	\randomtwoB
+	\randomtwoC
+	\addtocounter{r2c}{2}
 	\addtocounter{enc}{3}
 	\randomthree
 	\randomthreeB
@@ -761,9 +789,9 @@
 	{\arabic{track}}}% CHARISMA
 	{4}%DR
 	{\arabic{age}}% COMBAT
-	{Aggression \arabic{enc}, Projectiles \arabic{r3b}, Academics \arabic{r3}, Athletics \arabic{r2b}, Deceit \arabic{enc}, Tactics 2, Vigilance 3
+	{Aggression~\arabic{enc}, Projectiles~\arabic{r3b}, Academics~\arabic{r3}, Athletics~\arabic{r2b}, Deceit~\arabic{r2c}, Tactics~2, Vigilance~3
 	\knacks{\ifodd\value{page}\combatcaster\else\backtothewall\fi, \ifnumcomp{\value{r3}}{>}{2}{\laststand}{\adrenalinesurge}}
-	\Path{Blood}{\ifodd\value{r4}Aldaron \else Enchantment \fi \arabic{r4}, Invocation \arabic{enc}, \ifodd\value{r2}Force \arabic{r3b} \else Polymorph \arabic{r3}\fi }}{%
+	\Path{Blood}{\ifodd\value{r4}Aldaron\else Enchantment\fi~\arabic{r4}, Invocation~\arabic{enc}, \ifodd\value{r2}Force~\arabic{r3b}\else Polymorph~\arabic{r3}\fi }}{%
 	\iftoggle{bestiarychapter}{$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}}}}%
 	{\ifodd\value{r2}%
@@ -778,6 +806,7 @@
 \newcommand{\dwarventrader}[1][\npc{\M}{\arabic{r12} Dwarven Traders}]{
 	#1
 	\randomdozen
+	\randomtwoB
 	\randomthree\randomtwo\addtocounter{enc}{-1}
 	\person{\arabic{enc}}% STRENGTH
 	{1}% DEXTERITY
@@ -787,7 +816,7 @@
 	{0}}% CHARISMA
 	{0}% DR
 	{1}% COMBAT
-	{Crafts \arabic{r2b}, Deceit \arabic{r3}}% SKILLS
+	{Crafts~\arabic{r2b}, Deceit~\arabic{r3}}% SKILLS
 	{\shortsword, \ifodd\thepage\lootMedium\else\lootBig, \lootJewellery\fi}% EQUIPMENT
 	{}
 	}
@@ -804,7 +833,7 @@
 	{-1}}% CHARISMA
 	{0}% DR
 	{2}% COMBAT
-	{Crafts 1, Tactics 1}% SKILLS
+	{Crafts~1, Tactics~1}% SKILLS
 	{\ifodd\value{r2}\woodaxe, \partialchain\else\shortsword, \partialplate\fi, \lootMedium}% EQUIPMENT
 	{\knacks{Chosen Enemy: Goblinoids}\ifodd\value{r2b}, \defender\fi}% SKILLS
 }
@@ -824,7 +853,7 @@
 	{0}}%  CHARISMA
 	{0}% DR
 	{1}% COMBAT
-	{Academics \arabic{enc}, Crafts 1, Tactics 2\Path{Runes}{Fate \arabic{enc}, Force \arabic{r3}, Conjuration \arabic{r3b}}}% SKILLS
+	{Academics~\arabic{enc}, Crafts~1, Tactics~2\Path{Runes}{Fate~\arabic{enc}, Force~\arabic{r3}, Conjuration~\arabic{r3b}}}% SKILLS
 	{\shortsword, \partialchain, \lootMedium}% EQUIPMENT
 	{\mana{4}}
 	}
@@ -849,7 +878,7 @@
 	{\arabic{r4}}}% CHARISMA
 	{6}% DR
 	{\arabic{r3}}% COMBAT
-	{Academics 3, Athletics \arabic{r3c}, \ifodd\value{r2}Crafts 2, Performance \arabic{r3}, \else Empathy \arabic{r2b}, Survival 3, Vigilance \arabic{r3b}\fi \Path{Blood \& Song}{Polymorph 5, Aldaron \arabic{enc}, Fate \arabic{r3b}, \ifodd\value{r3} Enchantment \arabic{r2b}\fi}}% SKILLS
+	{Academics~3, Athletics~\arabic{r3c}, \ifodd\value{r2}Crafts~2, Performance~\arabic{r3}, \else Empathy~\arabic{r2b}, Survival~3, Vigilance~\arabic{r3b}\fi \Path{Blood \& Song}{Polymorph~5, Aldaron~\arabic{enc}, Fate~\arabic{r3b}, \ifodd\value{r3} Enchantment~\arabic{r2b}\fi}}% SKILLS
 	{\ifodd\thepage\Dagger, \lootJewellery\else\spear\fi}% EQUIPMENT
 	{\mana{6}\lockedmana{5}\gdef\armourtype{C}}
 	}
@@ -871,13 +900,13 @@
 	{\ifodd\value{r3}\arabic{r2}\else -1\fi}}% CHARISMA
 	{0}% DR
 	{\ifodd\value{list}1\else2\fi}% COMBAT
-	{\ifnumcomp{\value{r4}}{<}{2}{}{Projectiles \arabic{age},} Academics \arabic{age}, Athletics 1, \ifodd\value{r4} Crafts \arabic{r3}\else Performance \arabic{r2b}\fi, Stealth \arabic{r2}, Survival \arabic{r3b}, Vigilance \arabic{age}
+	{\ifnumcomp{\value{r4}}{<}{2}{}{Projectiles~\arabic{age},} Academics~\arabic{age}, Athletics~1, \ifodd\value{r4} Crafts~\arabic{r3}\else Performance~\arabic{r2b}\fi, Stealth~\arabic{r2}, Survival~\arabic{r3b}, Vigilance~\arabic{age}
 	\Path{Blood \ifodd\thepage\else \& Song\fi}%
 	{\ifnumcomp{\value{r4}}{<}{3}%
-		{Aldaron \arabic{r3}, }%
-		{Invocation \arabic{r3b}, }%
-	\ifodd\value{r3}\else Fate \arabic{r2}, \fi%
-	\ifodd\value{gold} Polymorph \arabic{r2b}\else Enchantment \arabic{r4}, \fi}%
+		{Aldaron~\arabic{r3}, }%
+		{Invocation~\arabic{r3b}, }%
+	\ifodd\value{r3}\else Fate~\arabic{r2}, \fi%
+	\ifodd\value{gold} Polymorph~\arabic{r2b}\else Enchantment~\arabic{r4}, \fi}%
 	\ifodd\value{r4} \else\knacks{%
 		\ifodd\value{r2}%
 			\laststand%
@@ -908,8 +937,8 @@
 	{\arabic{enc}}}% CHARISMA
 	{0}% DR
 	{\ifodd\value{mp} 1\else 0\fi}% COMBAT
-	{Projectiles \arabic{r2b}, Academics 3, Empathy 3, Deceit \arabic{enc}, Performance \arabic{r2}, \ifodd\value{r2}Stealth \else Tactics \fi \arabic{r2b}, Vigilance 2%
-	\Path{Blood}{Aldaron \arabic{r3}, Enchantment 5, Fate \arabic{r3}, Forces \arabic{r4}, Invocation 1, Polymorph 2}}% SKILLS
+	{Projectiles~\arabic{r2b}, Academics~3, Empathy~3, Deceit~\arabic{enc}, Performance~\arabic{r2}, \ifodd\value{r2}Stealth~\else Tactics~\fi \arabic{r2b}, Vigilance~2%
+	\Path{Blood}{Aldaron~\arabic{r3}, Enchantment~5, Fate~\arabic{r3}, Forces~\arabic{r4}, Invocation~1, Polymorph~2}}% SKILLS
 	{\Dagger, \lootJewellery\ifodd\thepage, \randomtwo\lootJewellery\ifodd\value{r4}, \lootMagic\fi\fi}% EQUIPMENT
 	{\mana{6}}
 }
@@ -928,9 +957,9 @@
 {\arabic{r2}}}% CHARISMA
 {0}% DR
 {0}% COMBAT
-{Academics \arabic{r3}, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Empathy \arabic{r2b}, \ifodd\value{page} \else Larceny 1, Stealth 1 \fi 
+{Academics~\arabic{r3}, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Empathy~\arabic{r2b}, \ifodd\value{page} \else Larceny~1, Stealth~1 \fi 
 \ifodd\value{page}
-	\Path{Alchemy}{Illusion \arabic{r2}}
+	\Path{Alchemy}{Illusion~\arabic{r2}}
 \fi}% SKILLS
 {\ifodd\value{r3}%
 	\Dagger,
@@ -961,7 +990,7 @@
 {\ifnum\value{enc}<0%
 	Projectiles \arabic{r2c}, 
 \fi%
-Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\value{page} \else Larceny \arabic{r2c}, \fi Stealth \arabic{r2c}
+Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\value{page} \else Larceny~\arabic{r2c}, \fi Stealth~\arabic{r2c}
 }% SKILLS
 {\ifnum\value{enc}=0%
 	\shortsword
@@ -994,8 +1023,8 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 	{0}% COMBAT
 	{\ifodd\value{r2}%
 		\else Projectiles \arabic{enc}, \fi%
-	Academics 3, \ifodd\value{chapter} Crafts \arabic{enc}, \fi Deceit \arabic{age},  Stealth \arabic{enc}
-	\Path{Alchemy}{Conjuration \arabic{age}, \ifodd\value{r2} Force \arabic{enc}, \else Invocation \arabic{enc}, \fi Illusion \arabic{age}}}% SKILLS
+	Academics~3, \ifodd\value{chapter} Crafts~\arabic{enc}, \fi Deceit~\arabic{age},  Stealth~\arabic{enc}
+	\Path{Alchemy}{Conjuration~\arabic{age}, \ifodd\value{r2} Force~\arabic{enc}, \else Invocation~\arabic{enc}, \fi Illusion~\arabic{age}}}% SKILLS
 	{\lootBig, \ifodd\thepage\lootMagic\fi}% EQUIPMENT
 	{\mana{6}}
 }
@@ -1013,7 +1042,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\ifodd \value{page} -1\else1\fi}}% CHARISMA
 {0}% DR
 {\ifodd\value{r2} 0\else 1\fi}% AGGRESSION
-{Beast Ken \arabic{r2}, Crafts \arabic{r2b}, \ifodd\value{r4} Empathy 1\fi}% SKILLS
+{Beast Ken~\arabic{r2}, Crafts~\arabic{r2b}, \ifodd\value{r4} Empathy~1\fi}% SKILLS
 {\Dagger, \lootSmall}% EQUIPMENT
 {}
 }
@@ -1030,13 +1059,14 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {0}}% CHARISMA
 {0}% DR
 {\ifodd\value{r3} 0\else 1\fi}% AGGRESSION
-{Empathy 1, \ifodd\thechapter Deceit \arabic{r2}\fi}% SKILLS
+{Empathy~1, \ifodd\thechapter Deceit~\arabic{r2}\fi}% SKILLS
 {\ifodd\thepage \Dagger, \lootSmall\else None\fi}% EQUIPMENT
 {}
 }
 
 \newcommand{\humantrader}[1][\npc{\M}{\arabic{r12} Traders}]{
 	#1
+	\randomtwo
 	\randomtwoB
 	\randomthree
 	\addtocounter{age}{-2}
@@ -1048,8 +1078,8 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-1}% WITS
 {\arabic{r2b}}}% CHARISMA
 {0}% DR
-{\arabic{enc}}% AGGRESSION
-{Academics \arabic{r2b}, \ifodd\value{r2} Crafts 1, Empathy \else Deceit \fi \arabic{r3}}% SKILLS
+{\arabic{enc}}% COMBAT
+{Academics~\arabic{r2b}, \ifodd\value{r2}~Crafts 1, Empathy\else Deceit\fi~\arabic{r3}}% SKILLS
 {\shortsword, \lootBig}% EQUIPMENT
 {}
 }
@@ -1071,7 +1101,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\arabic{track}}}% CHARISMA
 {0}% DR
 {\arabic{enc}}% COMBAT
-{Academics \arabic{r3}, Deceit \arabic{r3}, \ifodd\value{gold} Empathy \arabic{r3}, \fi Vigilance \arabic{r2}}% SKILLS
+{Academics~\arabic{r3}, Deceit~\arabic{r3}, \ifodd\value{gold} Empathy~\arabic{r3}, \fi Vigilance~\arabic{r2}}% SKILLS
 {\Dagger, \lootSmall, \lootBig~ hidden nearby}% EQUIPMENT
 {}
 }
@@ -1092,8 +1122,8 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\ifodd\value{r3} 0\else 1\fi}}% CHARISMA
 {0}% DR
 {\arabic{r2b}}% COMBAT
-{Academics \arabic{r3}, Empathy \arabic{r3b}
-\ifodd\value{r3b}\Path{Devotion}{Fate \arabic{age}, \ifodd\value{r4} \else Aldaron \arabic{enc}\fi}\fi}% SKILLS
+{Academics~\arabic{r3}, Empathy~\arabic{r3b}
+\ifodd\value{r3b}\Path{Devotion}{Fate~\arabic{age}, \ifodd\value{r4}\else Aldaron~\arabic{enc}\fi}\fi}% SKILLS
 {\ifodd\value{r2b}\quarterstaff\else\Dagger, \lootMedium\fi}% EQUIPMENT
 {\ifodd\value{r3b}\mana{2}\fi}
 }
@@ -1116,7 +1146,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {0}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{\ifodd\value{r3}Beast Ken \else Survival \fi \arabic{r2}, Tactics \arabic{r2b}%
+{\ifodd\value{r3}Beast Ken\else Survival\fi~\arabic{r2}, Tactics~\arabic{r2b}%
 	\ifodd\value{r3}%
 		\knacks{\ifodd\value{r2b}
 			\adrenalinesurge, 
@@ -1148,7 +1178,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {}
 }
 
-\newcommand{\humanarcher}[1][\npc{\M}{\arabic{r12} Archers}]{
+\newcommand{\humanarcher}[1][\npc{\M\T}{\arabic{r12} Archers}]{
 	#1
 	\randomtwo
 	\randomtwoB
@@ -1161,12 +1191,19 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {0}}% CHARISMA
 {0}% DR
 {\arabic{enc}}% COMBAT
-{Projectiles \arabic{r2b}, Crafts \arabic{r2b}, \ifodd\value{r4} Survival \else Tactics \fi \arabic{r2}%
+{Projectiles \arabic{r2b}, Crafts~\arabic{r2b}, \ifodd\value{r4} Survival~\else Tactics \fi~\arabic{r2}%
 \ifodd\value{r3}%
 \else%
 	\knacks{\mightydraw}
 \fi}% SKILLS
-{\longbow, dagger, \ifodd\value{r2}\partialleather, \lootMedium\fi}% EQUIPMENT
+{\longbow, dagger, \ifodd\value{r2}\partialleather, \lootMedium\fi%
+\iftoggle{team}{}%
+	{%
+		\ifnum\value{r12}<4%
+			, Spider arrows.%
+		\fi%
+	}%
+}% EQUIPMENT
 {}
 }
 
@@ -1189,7 +1226,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\arabic{track}}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{\ifodd\value{r4}Projectiles \arabic{r2b}, \fi Athletics \arabic{r2}, Deceit \arabic{r2b}, Larceny \arabic{r3}, \ifodd\value{r4}Stealth \arabic{r2b}, \fi\ifodd\value{r3}Tactics 1\fi
+{\ifodd\value{r4}Projectiles~\arabic{r2b}, \fi Athletics~\arabic{r2}, Deceit~\arabic{r2b}, Larceny~\arabic{r3}, \ifodd\value{r4}Stealth~\arabic{r2b}, \fi\ifodd\value{r3}Tactics~1\fi
 \knacks{\ifodd\value{r3}\dodger\else \foxhop\fi, \ifodd\value{r4} \perfectsneakattack\fi}}% SKILLS
 {\ifodd\value{gold}%
 	{\shortsword, dagger, }
@@ -1220,23 +1257,32 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {1}% WITS
 {\arabic{r3}}}% CHARISMA
 {0}% DR
-{\arabic{r2}}% COMBAT
-{Academics \ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Empathy \arabic{enc}, Deceit \ifodd\thepage 2 \else 1\fi, Performance \ifodd\thechapter 2 \else 1\fi%
-
-\ifnum\value{r3}>2
-	\ifnum\value{r12}>6
-		\Path{Song}{\ifodd\value{r3b}%
-			Enchantment%
-		\else%
-			Aldaron%
-		\fi \arabic{r4}, \ifodd\value{r12}%
-			Fate \arabic{enc}%
-		\fi \ifodd\value{gold}%
-			\addtocounter{r2b}{1} Illusion \arabic{r2b}%
-		\fi}
+{\arabic{age}}% COMBAT
+{Academics~\ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Empathy~\arabic{enc}, Deceit~\ifodd\thepage 2\else 1\fi, Performance~\ifodd\thechapter 2\else 1\fi%
+
+\iftoggle{team}{}%
+{%
+	\ifnum\value{r3}>2
+		\ifnum\value{r12}>6
+			\Path{Song}{%
+			\ifodd\value{r3b}%
+				Enchantment%
+			\else%
+				Aldaron%
+			\fi~%
+				\arabic{r4}, %
+			\ifodd\value{r12}%
+				Fate \arabic{enc}%
+			\fi %
+			\ifodd\value{gold}%
+				\addtocounter{r2b}{1}%
+				Illusion \arabic{r2b}%
+			\fi}
+		\fi
+	\else
 	\fi
-\else
-\fi}% SKILLS
+}%
+}% SKILLS
 {\ifodd\value{r3}\rapier%
 	\else%
 	\Dagger%
@@ -1263,14 +1309,14 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {0}}% CHARISMA
 {0}% DR
 {\arabic{r2b}}% COMBAT
-{Academics \arabic{r3}, \ifodd\value{r3} Deceit \arabic{r2}, Tactics \arabic{enc}\else Empathy \arabic{r2}, Vigilance \arabic{enc}\fi
-\Path{Alchemy}{\ifodd\value{r2b} Conjuration \arabic{r3b}, Force \else Invocation \fi \arabic{r4}, \ifodd\thepage Illusion \arabic{r3}\fi
+{Academics~\arabic{r3}, \ifodd\value{r3} Deceit~\arabic{r2}, Tactics~\arabic{enc}\else Empathy~\arabic{r2}, Vigilance~\arabic{enc}\fi
+\Path{Alchemy}{\ifodd\value{r2b} Conjuration~\arabic{r3b}, Force\else Invocation \fi~\arabic{r4}, \ifodd\thepage Illusion~\arabic{r3}\fi
 }}% SKILLS
 {\lootMedium, \ifodd\thepage\lootMagic\else mana stone with 4 mp\fi}% EQUIPMENT
 {\mana{6}\lockedmana{\value{r2}}}
 }
 
-\newcommand{\gnollhunter}[1][\npc{\M\T}{\arabic{r12} Gnoll Hunters}]{
+\newcommand{\gnollhunter}[1][\npc{\T}{\arabic{r12} Gnoll Hunters}]{
 	#1
 	\randomtwo\addtocounter{enc}{1}
 	\randomtwoB
@@ -1284,7 +1330,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-1}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{Aggression 2, Projectiles \arabic{r2c}, Survival 3\knacks{\ifodd\value{enc}\adrenalinesurge\else\charge\fi}}% SKILLS
+{Aggression~2, Projectiles~\arabic{r2c}, Survival~3\knacks{\ifodd\value{enc}\adrenalinesurge\else\charge\fi}}% SKILLS
 {\spear}% EQUIPMENT
 {}
 }
@@ -1307,11 +1353,11 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-2}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Aggression 2, Projectiles \arabic{r2b}, Academics \arabic{r2}, Beast Ken \arabic{r2b}, \ifodd\value{r3b}\else Deceit \arabic{r3b}, \fi Stealth \arabic{r3},
+{Aggression~2, Projectiles~\arabic{r2b}, Academics~\arabic{r2}, Beast Ken~\arabic{r2b}, \ifodd\value{r3b}\else Deceit~\arabic{r3b}, \fi Stealth~\arabic{r3},
 \ifnum\value{r4}>1%
-	{Survival \arabic{enc}, Vigilance \arabic{enc}}%
+	{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{r3c}}}% SKILLS
+\Path{Divinity (Qualm\"e)}{\ifodd\value{r2} Fate\else Aldaron\fi~\arabic{r3}, \ifodd\value{r3b}\else Enchantment~\arabic{r3}, \fi Necromancy~\arabic{r3c}}}% SKILLS
 {\Dagger\ifodd\value{r3}\else, \lootMagic\fi}% EQUIPMENT
 {\mana{4}}
 }
@@ -1329,7 +1375,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 	{\arabic{r2}}% WITS
 	{0}% DR
 	{\arabic{enc}}% AGGRESSION
-	{Athletics 3, Stealth \arabic{r2}, Sealth \arabic{r3}, Survival \arabic{r3}, Vigilance 3
+	{Athletics~3, Stealth~\arabic{r2}, Sealth~\arabic{r3}, Survival~\arabic{r3}, Vigilance~3
 	\knacks{\ifodd\value{r3}\charge\else\perfectsneakattack\fi}}% SKILLS
 	{\claws}{}
 	}
@@ -1346,7 +1392,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\arabic{r3}}% WITS
 {\arabic{enc}}% DR
 {2}% AGGRESSION
-{Survival \arabic{r2}}% SKILLS
+{Survival~\arabic{r2}}% SKILLS
 {}% ABILITIES
 {}
 }
@@ -1361,7 +1407,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {0}% WITS
 {2}% DR
 {2}% AGGRESSION
-{Athletics 3, Survival 1
+{Athletics~3, Survival~1
 \ifodd\value{r2}\knacks{\charge}\fi}% SKILLS
 {\quadraped}% ABILITIES
 {}
@@ -1377,7 +1423,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-3}% WITS
 {\arabic{r2b}}% DR
 {\arabic{r2}}% AGGRESSION
-{Projectiles \arabic{r2}, Survival 1}% SKILLS
+{Projectiles \arabic{r2}, Survival~1}% SKILLS
 {Acid Spray}% ABILITIES
 {\addtocounter{str}{1}}
 }
@@ -1396,7 +1442,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {2}% WITS
 {\arabic{age}}% DR
 {\arabic{r2}}% AGGRESSION
-{Athletics \arabic{r2}, Vigilance \arabic{r2}}% SKILLS
+{Athletics~\arabic{r2}, Vigilance~\arabic{r2}}% SKILLS
 {\web}% ABILITIES
 {}
 }
@@ -1415,7 +1461,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\arabic{r2b}}% WITS
 {3}% DR
 {\arabic{enc}}% AGGRESSION
-{Athletics 2, Survival \arabic{r3}, Stealth \arabic{r3}, Tactics \arabic{r2}}% SKILLS
+{Athletics~2, Survival~\arabic{r3}, Stealth~\arabic{r3}, Tactics~\arabic{r2}}% SKILLS
 {None}% ABILITIES
 {}
 }
@@ -1433,7 +1479,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {\arabic{r2}}% WITS
 {1}% DR
 {\arabic{r3}}% AGGRESSION
-{Athletics \arabic{r2b}, Survival \arabic{r2}, Vigilance \arabic{r2b}}% SKILLS
+{Athletics~\arabic{r2b}, Survival~\arabic{r2}, Vigilance~\arabic{r2b}}% SKILLS
 {\teeth, \quadraped}% ABILITIES
 {}
 }
@@ -1450,14 +1496,14 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {1}% WITS
 {2}% DR
 {3}% AGGRESSION
-{Athletics \arabic{r2b}, Survival \arabic{r2}, Vigilance \arabic{r3}}% SKILLS
+{Athletics~\arabic{r2b}, Survival~\arabic{r2}, Vigilance~\arabic{r3}}% SKILLS
 {\teeth, \quadraped}% ABILITIES
 {}
 }
 
 %%%%%%%%%% NURA %%%%%%%%%%
 
-\newcommand{\goblin}[1][\npc{\M\N}{\arabic{r12} Goblins}]{
+\newcommand{\goblin}[1][\npc{\N\T}{\arabic{r12} Goblins}]{
 	#1
 	\randomtwo
 	\randomtwoB
@@ -1473,7 +1519,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-4}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{Aggression 2, Projectiles \arabic{r2}, Athletics 1, Deceit 1, Stealth \arabic{r3}, \ifodd\value{r4}Tactics \arabic{r2}\fi%
+{Aggression~2, Projectiles~\arabic{r2}, Athletics~1, Deceit~1, Stealth~\arabic{r3}, \ifodd\value{r4}Tactics~\arabic{r2}\fi%
 \ifodd\value{r3} \else\knacks{\perfectsneakattack}\fi%
 }% SKILLS
 {\ifodd\value{r2}%
@@ -1485,8 +1531,10 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 		\Dagger%
 	\fi%
 \fi%
-\ifnum\value{r4b}=4%
-	, lock picking set%
+\ifodd\value{r3b}%
+	\iftoggle{team}{}{
+		, lock picking set%
+	}
 \fi%
 .}% EQUIPMENT
 {}
@@ -1521,7 +1569,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-4}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% AGGRESSION
-{\randomtwoB Projectiles \arabic{r2}, Athletics 1, Deceit 1, Stealth \arabic{r2b}, Tactics 1}% SKILLS
+{\randomtwoB Projectiles~\arabic{r2}, Athletics~1, Deceit~1, Stealth~\arabic{r2b}, Tactics~1}% SKILLS
 {\javelin, bag of rocks}% EQUIPMENT
 {}
 }
@@ -1534,6 +1582,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 	\addtocounter{age}{-1}
 	\randomthreeB
 	\randomfour
+	\randomfourB
 \person{-2}% STRENGTH
 {\arabic{r3}}% DEXTERITY 
 {1}% SPEED
@@ -1542,13 +1591,17 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-4}}% CHARISMA
 {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{Nura}{Invocation \arabic{r3}, Necromancy \arabic{r3b}, Saurecanta \arabic{r4}}}% SKILLS
-{\Dagger\ifodd\value{r4}, torch\fi}% EQUIPMENT
+{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\ifodd\value{r4}, torch\fi%
+\ifnum\value{r4b}=4%
+	, \lootMagic
+\fi%
+}% EQUIPMENT
 {\mana{4}}
 }
 
-\newcommand{\hobgoblin}[1][\npc{\T\M\N}{\arabic{r12} Hobgoblins}]{
+\newcommand{\hobgoblin}[1][\npc{\T\N}{\arabic{r12} Hobgoblins}]{
 	#1
 	\randomtwo
 	\randomtwoB
@@ -1631,7 +1684,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-4}}% CHARISMA
 {0}% DR
 {\arabic{r2b}}% AGGRESSION
-{Beast Ken \arabic{r2}, \ifodd\value{r2}Crafts \else Tactics \fi \arabic{r2}}% SKILLS
+{Beast Ken \arabic{r2}, \ifodd\value{r2}Crafts\else Tactics\fi~\arabic{r2}}% SKILLS
 {\ifodd\value{r2}
 	Nothing.
 \else
@@ -1694,6 +1747,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 	\randomtwo
 	\randomtwoB
 	\addtocounter{enc}{-3}
+	\randomthreeC
 	\randomdozen
 \animal{\arabic{r2b}}% STRENGTH
 {-2}% DEXTERITY 
@@ -1703,7 +1757,11 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {2}% AGGRESSION
 {}% SKILLS
 {Undead}% ABILITIES
-{}
+{
+\ifnumcomp{\value{r3c}}{=}{1}%
+	{\textbf{Equipment:} & \lootSmall \\}%
+	{}
+}%
 }
 
 \newcommand{\ghast}[1][\npc{\D}{Ghast}]{
@@ -1719,7 +1777,7 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-5}}% CHARISMA
 {2}% DR
 {2}% COMBAT
-{Aggression \arabic{enc}, \ifodd\thepage Beast Ken \else Deceit \fi \arabic{r3}, Survival \arabic{r3b}, Tactics \arabic{r2}, Vigilance 1}% SKILLS
+{Aggression~\arabic{enc}, \ifodd\thepage Beast~Ken\else Deceit\fi~\arabic{r3}, Survival~\arabic{r3b}, Tactics~\arabic{r2}, Vigilance~1}% SKILLS
 {\ifodd\value{r2}%
 	\longsword%
 	\ifodd\value{r4}%
@@ -1754,8 +1812,8 @@ Academics 1, \ifodd\value{page} Crafts \arabic{r2}, \else \fi Deceit 1, \ifodd\v
 {-5}}% CHARISMA
 {2}% DR
 {\arabic{r2}}% COMBAT
-{Aggression 2, Projectiles \arabic{r2c}, Academics \arabic{r3}, Deceit 1, Medicine \arabic{r2c}, Vigilance \arabic{r2}
-\Path{Devotion (Qualm\"e)}{\ifodd\value{r4} Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r2} Enchantment \arabic{r3c}, \else \fi Necromancy 4}}% SKILLS
+{Aggression~2, Projectiles~\arabic{r2c}, Academics~\arabic{r3}, Deceit~1, Medicine~\arabic{r2c}, Vigilance~\arabic{r2}
+\Path{Devotion (Qualm\"e)}{\ifodd\value{r4} Aldaron~\arabic{enc}, \fi Fate~\arabic{enc}, \ifodd\value{r2} Enchantment~\arabic{r3c}, \fi Necromancy~4}}% SKILLS
 {\ifodd\thepage%
 	\Dagger%
 \else%
@@ -1786,8 +1844,8 @@ mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIP
 {-5}}% CHARISMA
 {2}% DR
 {\arabic{r2}}% AGGRESSION
-{Aggression 2, Projectiles \arabic{r2}, Academics \arabic{r3}, Deceit 1, Medicine \arabic{r3c}, Vigilance \arabic{r2}
-\Path{Devotion (Qualm\"e)}{\ifodd\value{r3}Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r4} Enchantment \arabic{r3}, \else \fi Necromancy 5}}% SKILLS
+{Aggression 2, Projectiles~\arabic{r2}, Academics~\arabic{r3}, Deceit~1, Medicine~\arabic{r3c}, Vigilance~\arabic{r2}
+\Path{Devotion (Qualm\"e)}{\ifodd\value{r3}Aldaron~\arabic{enc}, \fi Fate~\arabic{enc}, \ifodd\value{r4} Enchantment~\arabic{r3}, \fi Necromancy~5}}% SKILLS
 {\ifodd\thechapter%
 	\Dagger, %
 \else
@@ -2001,8 +2059,8 @@ mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \
 {-5}}% CHARISMA
 {0}% DR
 {0}% AGGRESSION
-{Projectiles \arabic{r3}, Academics 3, Deceit \arabic{r2}, Ether Lore \arabic{r2b}, Tactics \arabic{r3b}
-\Path{Divinity}{\addtocounter{age}{2} Force \arabic{age}, Illusion \arabic{r3}, Invocation \arabic{r4}, Conjuration \arabic{enc}, \addtocounter{r3b}{2}}}% SKILLS
+{Projectiles~\arabic{r3}, Academics~3, Deceit~\arabic{r2}, Ether~Lore~\arabic{r2b}, Tactics~\arabic{r3b}
+\Path{Divinity}{\addtocounter{age}{2} Force~\arabic{age}, Illusion~\arabic{r3}, Invocation~\arabic{r4}, Conjuration~\arabic{enc},}}% SKILLS
 {None}% ABILITIES
 {\setcounter{gold}{\value{age}}\multiply\value{gold} by 3\addtocounter{gold}{\value{int}}\setcounter{sp}{\value{gold}}%
 \mana{8}\lockedmana{\value{age}}\addtocounter{xpbonus}{4}}
@@ -2018,7 +2076,7 @@ mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \
 {\arabic{r3}}% WITS
 {3}% DR
 {0}% AGGRESSION
-{Stealth 3, Vigilance 2}% SKILLS
+{Stealth~3, Vigilance~2}% SKILLS
 {Gas}% ABILITIES
 {\addtocounter{xpbonus}{3}}
 }