diff --git a/docs.tex b/docs.tex
index c50358a1b6cf43c6154f9847a0209bbdc4df7bcc..e724c47e9ccd72d0e58fa82ad1e1a94fc9350d02 100644
--- a/docs.tex
+++ b/docs.tex
@@ -38,6 +38,12 @@ Which then makes a male dragon called ``Bob'':
 You can summon dozens of monsters, including \verb"humansoldier", \verb"basilisk", and \verb"\ghoul"
 (see \verb"monsters.tex" for all the examples).
 
+Placing a number after it changes the number of boxes.
+
+\ghoul[\npc{\T[3]\D}{5 Ghouls}]
+
+noApp \arabic{noAppearing}
+
 \subsection{Individual NPCs}
 
 Individual characters can be created by using the \verb"\npc" command then the \verb"person" command, with its nine arguments:
diff --git a/glossary.tex b/glossary.tex
index 825be707c67516f65d4f642e217a5593b2584d6c..bca1dbbbcf42944fb578148e4c76aeb0be0495bd 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -213,7 +213,7 @@
 
 % SHORT COMMANDS
 
-\newcommand{\T}{\gls{T}\settoggle{team}{true}} % groups
+\newcommand{\T}[1][1]{\gls{T}\setcounter{noAppearing}{#1}} % groups
 \newcommand{\M}{\gls{M}} % male
 \newcommand{\F}{\gls{F}} % female
 \newcommand{\E}{\gls{E}} % sentient
diff --git a/layout.sty b/layout.sty
index f91eeffa1d862cdba3f0c2316370afd9c25508d3..1d18bcb4502c9ffc888953e6a01bd778ee63cc22 100644
--- a/layout.sty
+++ b/layout.sty
@@ -616,7 +616,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \newcommand{\mannerism}{}
 \newcommand{\archetype}{}
 \newcommand{\npcsymbol}{}
-\newcommand{\npc}[2]{\settoggle{personality}{false}\renewcommand{\name}{#1 #2}\renewcommand{\npcsymbol}{#1}}
+\newcommand{\npc}[3][1]{\settoggle{personality}{false}\renewcommand{\name}{#2 #3}\renewcommand{\npcsymbol}{#2}}
 \newcommand{\NPC}[5]{\renewcommand{\name}{#1 #2}
 \renewcommand{\npcsymbol}{#1}
 \settoggle{personality}{true}
@@ -633,8 +633,6 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \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}
@@ -681,6 +679,8 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \newcounter{gold}
 \setcounter{gold}{\day}
 \setcounter{enc}{0}
+\newcounter{noAppearing}
+  \setcounter{noAppearing}{1}
 
 \newcommand{\randomtwo}{%
   \ifnum\value{r2}>1%
diff --git a/loot.sty b/loot.sty
index 41f3f8ba633f0675778176e69bc0be2bde4a9376..0055f21ef84d06a2e36cdfdbe39130fc96a4caf2 100644
--- a/loot.sty
+++ b/loot.sty
@@ -35,8 +35,10 @@
 }
 
 \newcommand{\lootMagic}{%
-	\iftoggle{team}{Mana stone holding 2 MP}%
-  {\iftoggle{bestiarychapter}{}%
+  \ifnum\value{noAppearing}>1%
+  Mana stone holding 2 MP%
+  \else%
+  \iftoggle{bestiarychapter}{}%
     {%
       \stepcounter{treasure}%
       \ifnum\value{treasure}>10\setcounter{treasure}{0}\fi%
@@ -66,7 +68,7 @@
         Mana Stone with 4 \glspl{mp}%
       \fi%
     }%
-  }%
+  \fi%
 }
 
 \newcommand{\lootJewellery}{%
diff --git a/monsters.sty b/monsters.sty
index 1c3e1e6a304183eb0a178e133f1efd94bbd163fd..dbee47243cab5293ce3a439c1d528975fc7cd2ac 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -670,11 +670,8 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 	\knacks{\mightydraw}
 \fi}% SKILLS
 {\longbow, dagger\ifodd\value{r2}, \partialleather, \lootMedium\fi%
-\iftoggle{team}{}%
-	{%
-		\iftoggle{team}{%
-			, \arabic{r12} Spider arrows}.%
-	}%
+\ifnum\value{noAppearing}=1%
+, \arabic{r12} Spider arrows.%
 }% EQUIPMENT
 {}
 }
@@ -729,8 +726,7 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 {\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{noAppearing}=1
 	\ifnum\value{r3}>2
 		\ifnum\value{r12}>6
       \knacks{\songCaster}
@@ -751,7 +747,7 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 		\fi
 	\else
 	\fi
-}%
+\fi%
 }% SKILLS
 {\ifodd\value{r3}\rapier%
 	\else%
@@ -1008,9 +1004,9 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 	\fi%
 \fi%
 \ifodd\value{r3b}%
-	\iftoggle{team}{}{%
+	\ifnum\value{noAppearing}=1
 		, tinder box%
-	}%
+	\fi%
 \fi%
 .}% EQUIPMENT
 {}
diff --git a/stats.sty b/stats.sty
index b6a98ed40b41cf0211f6ad32ab8fbc0f4ae2ab8c..c7f4bec7288f81589be16da95d6f160157a74517 100644
--- a/stats.sty
+++ b/stats.sty
@@ -252,23 +252,23 @@ You don't need to fall unconscious when making a Vitality check)%
 %
 \newcommand{\person}[9]{
   \settoggle{creatureBox}{true}
-	\settoggle{mind}{true}
-	\setcounter{str}{#1}
-	\setcounter{dex}{#2}
-	\setcounter{spd}{#3}
-	\mind#4
-	\setcounter{dr}{#5}
-	\setcounter{att}{#6}
-	\renewcommand{\skills}{#7}
-	\renewcommand{\equipment}{#8}
-	\renewcommand{\mods}{#9}
-
-	\clean
-
-	\renewcommand{\armourtype}{P}
-	\gdef\armourtype{P}
-
-	\begin{tcolorbox}[
+  \settoggle{mind}{true}
+  \setcounter{str}{#1}
+  \setcounter{dex}{#2}
+  \setcounter{spd}{#3}
+  \mind#4
+  \setcounter{dr}{#5}
+  \setcounter{att}{#6}
+  \renewcommand{\skills}{#7}
+  \renewcommand{\equipment}{#8}
+  \renewcommand{\mods}{#9}
+
+  \clean
+
+  \renewcommand{\armourtype}{P}
+  \gdef\armourtype{P}
+
+  \begin{tcolorbox}[
     title={\name},
 		before upper={\parindent0pt},
 		halign=flush left,
@@ -277,12 +277,12 @@ You don't need to fall unconscious when making a Vitality check)%
     top=0pt,
 		]
 
-	\creaturestats
+  \creaturestats
 
-	\derivedstats
-	\end{tcolorbox}
+  \derivedstats
+  \end{tcolorbox}
 
-	\iftoggle{personality}{
+  \iftoggle{personality}{
 
     \textbf{Archetype:} \archetype, 
     \textbf{Description:} \NPCdescription
@@ -294,7 +294,7 @@ You don't need to fall unconscious when making a Vitality check)%
     \settoggle{personality}{false}}%
 	{}
   \settoggle{creatureBox}{false}
-  \settoggle{team}{false}
+  \setcounter{noAppearing}{1}
   \afterparnoindent
 }
 
@@ -339,6 +339,7 @@ You don't need to fall unconscious when making a Vitality check)%
 
 	\end{tcolorbox}
   \settoggle{creatureBox}{false}
+  \setcounter{noAppearing}{1}
   \afterparnoindent
 }
 
@@ -467,39 +468,38 @@ You don't need to fall unconscious when making a Vitality check)%
     {
       \addtocounter{damage}{\value{strb}} (\calculatedamage{damage})}{},
     }
-    \ifnumcomp{\value{dr}}{>}{0}{DR \arabic{dr}~\armourtype, }{}
-	\ifnum\value{mp}>0%
-		\addtocounter{mp}{\value{int}}%
-		\noindent\mbox{
-		\ifnum\value{mpb}=0%
-			\arabic{mp}~MP%
-		\else%
-			\addtocounter{mpb}{\value{mp}}%
-			\arabic{mpb} / \arabic{mp} MP%
-		\fi
-		\iftoggle{bestiarychapter}%
-			{, }%
-			{ \Repeat{\value{mp}}{\sqn}, }%
-		}
-	\fi
-	\addtocounter{hp}{6}
-  \addtocounter{damage}{4}
-	\noindent\mbox{\arabic{hp} HP \iftoggle{bestiarychapter}{}{%
-	\ {\large\Repeat{\value{hp}}{\sqn}}%
-		}%
-	}%
-	\ifnumcomp{\value{sp}}{>}{0}%
-		{, \mbox{%
-			\arabic{sp} SP %
-			\iftoggle{bestiarychapter}{}{\Repeat{\value{sp}}{\sqn}}%
-		}%
-		}%
-	{}%
+    \ifnumcomp{\value{dr}}{>}{0}{\mbox{DR \arabic{dr}~\armourtype,} }{}%
+  \addtocounter{hp}{6}%
+  \addtocounter{damage}{4}%
+  \ifnum\value{mp}>0%
+    \addtocounter{mp}{\value{int}}%
+    \addtocounter{mp}{\value{mpb}}%
+  \fi%
+  \iftoggle{bestiarychapter}{%
+  HP \arabic{hp},
+  \ifnum\value{mp}>0%
+      \addtocounter{mpb}{\value{mp}}%
+      MP \arabic{mpb} / \arabic{mp},
+  \fi%
+  \ifnum\value{sp}>0%
+  SP \arabic{sp},
+  \fi%
+  }{%
 
+  \noindent\begin{tabular}{ll}
+    HP \arabic{hp} \Repeat{\value{noAppearing}}{& \Repeat{\value{hp}}{\sqn} \\}
+    \ifnum\value{mp}>0
+      MP \arabic{mp} \Repeat{\value{noAppearing}}{& \Repeat{\value{mp}}{\sqn} \\}
+    \fi
+    \ifnum\value{sp}>0
+      SP \arabic{sp} \Repeat{\value{noAppearing}}{& \Repeat{\value{sp}}{\sqn} \\}
+    \fi
+  \end{tabular}
+  }
 
-	\iftoggle{allyCharacter}{}{
-		\calculateXP
-	}
+  \iftoggle{allyCharacter}{}{
+    \calculateXP
+  }
 \end{center}%
 }
 %
@@ -540,7 +540,7 @@ You don't need to fall unconscious when making a Vitality check)%
     \setcounter{xp}{\value{attackXPtotal}}%
     \addtocounter{xp}{\value{defenceXPtotal}}%
 
-	\iftoggle{debug}{str: \arabic{str}, strb: \arabic{strb}, dex: \arabic{dex}, dexb: \arabic{dexb}, spd: \arabic{spd}, spdb: \arabic{spdb}, att: \arabic{att}, damage: \arabic{damage}, XP Bonus: \arabic{xpbonus}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}, mp: \arabic{mp} Grand Total: \arabic{xp}}{\hrulefill}
+  \iftoggle{debug}{str: \arabic{str}, strb: \arabic{strb}, dex: \arabic{dex}, dexb: \arabic{dexb}, spd: \arabic{spd}, spdb: \arabic{spdb}, att: \arabic{att}, damage: \arabic{damage}, XP Bonus: \arabic{xpbonus}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}, mp: \arabic{mp} Grand Total: \arabic{xp}}{\hrulefill}
     
   \iftoggle{examplecharacter}%
   {}%
@@ -569,11 +569,11 @@ You don't need to fall unconscious when making a Vitality check)%
 %%%%%%%%%%%%%%%%%%%% Creature Abilities
 
 \newcommand{\abilities}[1]{ \\
-	\ent{Abilities:} & #1 
-	}
+  \ent{Abilities:} & #1 
+  }
 
 \newcommand{\acidSpray}{
-	\addtocounter{str}{-2}Acidic spray (spray for \calculatedamage{str} Damage per turn)%
+  \addtocounter{str}{-2}Acidic spray (spray for \calculatedamage{str} Damage per turn)%
   \addtocounter{str}{2}%
 }