diff --git a/config/monsters.tex b/config/monsters.tex
index d1ec338837957935000db696c641022ef8f00a01..cf6a31254fb3c20fd9ea2c67e193b51468c55457 100644
--- a/config/monsters.tex
+++ b/config/monsters.tex
@@ -141,12 +141,12 @@
 \newcommand{\bucklar}{\addtocounter{dex}{1}bucklar shield}
 
 % ARMOUR
-\newcommand{\partialleather}{partial leather armour \addtocounter{dr}{3}}
-\newcommand{\completeleather}{complete leather armour \addtocounter{dr}{3}\gdef\armourtype{C}}
-\newcommand{\partialchain}{partial chain armour\addtocounter{dr}{4}}
-\newcommand{\completechain}{complete chain armour\addtocounter{dr}{4}\gdef\armourtype{C}}
-\newcommand{\partialplate}{partial plate armour\addtocounter{dr}{5}}
-\newcommand{\completeplate}{complete plate armour\addtocounter{dr}{5}\gdef\armourtype{C}}
+\newcommand{\partialleather}{partial leather armour \ifnumcomp{\value{dr}}{>}{2}{\addtocounter{dr}{1}}{\addtocounter{dr}{3}}}
+\newcommand{\completeleather}{complete leather armour \ifnumcomp{\value{dr}}{>}{2}{\addtocounter{dr}{1}}{\addtocounter{dr}{3}}\gdef\armourtype{C}}
+\newcommand{\partialchain}{partial chain armour \ifnumcomp{\value{dr}}{>}{3}{\addtocounter{dr}{1}}{\addtocounter{dr}{4}}}
+\newcommand{\completechain}{complete chain armour \ifnumcomp{\value{dr}}{>}{3}{\addtocounter{dr}{2}}{\addtocounter{dr}{4}}\gdef\armour{C}}
+\newcommand{\partialplate}{partial plate armour \ifnumcomp{\value{dr}}{>}{4}{\addtocounter{dr}{2}}{\addtocounter{dr}{5}}}
+\newcommand{\completeplate}{complete plate armour \ifnumcomp{\value{dr}}{>}{4}{\addtocounter{dr}{2}}{\addtocounter{dr}{5}\gdef\armourtype{C}}}
 
 % 
 % _ __   ___ _ __ ___  ___  _ __  
@@ -417,7 +417,7 @@
 		}
 
 	\newcommand{\web}{
-		\setcounter{track}{7}\addtocounter{track}{\value{str}}
+		\setcounter{track}{6}\addtocounter{track}{\value{str}}
 		Web (Strength + Athletics, TN \arabic{track} to break free as a movement action)
 		}
 
@@ -477,16 +477,20 @@
 \newcommand{\chitincrawler}[1][\npc{\C}{Chitincrawler}]{
 	#1
 	\randomtwo
+	\addtocounter{enc}{3}
+	\randomtwoB
+	\addtocounter{r2b}{-1}
 	\randomthree
-	\addtocounter{enc}{2}
-\animal{\ifodd\value{chapter} 4\else 3\fi}% STRENGTH
-{\ifodd\value{page} 1\else 0\fi}% DEXTERITY 
-{\arabic{r2}}% SPEED
-{\arabic{r2}}% WITS
+	\randomthreeB
+	\randomfour
+\animal{\arabic{enc}}% STRENGTH
+{\arabic{r2b}}% DEXTERITY 
+{\arabic{r3b}}% SPEED
+{\arabic{r4}}% WITS
 {\arabic{enc}}% DR
 {\ifodd\value{r3} 3\else 4\fi}% AGGRESSION
-{Athletics \arabic{enc}, Survival \arabic{r3}}% SKILLS
-{Web}% ABILITIES
+{Athletics \arabic{r3b}, Survival \arabic{r3}\ifodd\value{r4} Vigilance \arabic{r3b}\fi}% SKILLS
+{\web}% ABILITIES
 {}
 }
 %
@@ -1573,6 +1577,7 @@
 	\addtocounter{age}{4}
 	\randomtwoB
 	\addtocounter{r2b}{-\value{age}}
+	\addtocounter{r2b}{3}
 \person{\arabic{age}}% STRENGTH
 {-1}% DEXTERITY 
 {\arabic{r2b}}% SPEED
@@ -1582,7 +1587,7 @@
 {\arabic{age}}% DR
 {\arabic{r4}}% AGGRESSION
 {Crafts \arabic{r2}, Deceit \arabic{r3}, Ether Lore 1, }% SKILLS
-{}% ABILITIES
+{\ifodd\value{r3}None\else\greatsword\fi}% EQUIPMENT
 {}
 }
 
diff --git a/config/preamble.tex b/config/preamble.tex
index 3aa0dbdedb5e417739673f3971cd8761dbdec4ec..543e37587f5279773c1d29c00f906f9813c4d78f 100644
--- a/config/preamble.tex
+++ b/config/preamble.tex
@@ -296,7 +296,8 @@ Roll & Result \\
 }
 
 \newcommand{\randomtwoB}{
-	\ifnumcomp{\value{r2b}}{=}{2}{\setcounter{r2b}{1}}{\setcounter{r2b}{2}}
+	\ifodd\value{r3b}\setcounter{r2b}{1}\else\setcounter{r2b}{2}\fi
+	\randomthreeB
 }
 
 \newcommand{\randomthree}{