diff --git a/config/autocompile.sh b/config/autocompile.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bb968707ba0e805404cd21f6a8e62ffa31f1a8d3
--- /dev/null
+++ b/config/autocompile.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# if you're in the subtree, back up
+[ ! -d .git ] && [ -e ../.git ] && \
+	cd ..
+
+# If you're setting up:
+[ ! -e main.tex ] && [ -e config/main.tex ] && \
+	cp config/main.tex . && \
+	ln -s config/autocompile.sh .
+
+
+if [ $1 = clean ]; then
+	rm -r *aux *log main.{i,g}* *toc *.ptc *.out svg-inkscape 2>/dev/null
+	exit 0
+fi
+
+if [ $1 = tree ]; then
+	[ -e ../config ] || ( echo "You don't have a local config repo" && exit 1 )
+	git status
+	git subtree -P config pull ../config master
+	git subtree -P config push ../config master
+fi
+pdflatex -shell-escape main.tex
+makeglossaries main
+makeindex main.idx
+pdflatex main.tex
diff --git a/config/monsters.tex b/config/monsters.tex
index 05c798a10c2e8b0b0eff4ccc6c67b36f7f3243cf..c4fd0db8fdd91f01b007ec6752cf13437b92ddc3 100644
--- a/config/monsters.tex
+++ b/config/monsters.tex
@@ -121,7 +121,7 @@
 \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}\renewcommand{\weaponknackone}{\addtocounter{spd}{2}}}
-\newcommand{\quarterstaff}{Quarterstaff\addtocounter{str}{1}\addtocounter{spd}{1}\addtocounter{dex}{2}\renewcommand{\weaponknackone}{\addtocounter{spd}{2}}}
+\newcommand{\quarterstaff}{Quarterstaff\addtocounter{str}{1}\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{\greatclub}{Greatclub\addtocounter{str}{4}\addtocounter{spd}{1}\addtocounter{dex}{1}}
@@ -449,7 +449,8 @@
 %
 \newcommand{\boar}[1][\npc{\C}{Boar}]{
 	#1
-	\animal{4}% STRENGTH
+	\randomtwoB
+	\animal{\arabic{r2b}}% STRENGTH
 {-2}% DEXTERITY 
 {3}% SPEED
 {1}% WITS
@@ -676,7 +677,7 @@
 	\Path{Blood \ifodd\thepage\else \& Song\fi}%
 	{\ifnumcomp{\value{r4}}{<}{3}%
 		{Aldaron \arabic{r3}, }%
-		{Invocation \arabic{r3b}}%
+		{Invocation \arabic{r3b}, }%
 	\ifodd\value{r3}\else Fate \arabic{r2}\fi%
 	\addtocounter{gold}{1}\ifodd\value{gold} Polymorph \arabic{r2b}\else Enchantment \arabic{age}, \fi}%
 	\ifodd\value{r4} \else\knacks{%
@@ -1280,14 +1281,16 @@
 {0}% DR
 {\arabic{r2b}}% AGGRESSION
 {Beast Ken \arabic{r2}, \ifodd\value{r2}Crafts \else Tactics \fi \arabic{r2}}% SKILLS
-{\ifodd\value{r3}
+{\ifodd\value{r2}
 	\greatclub
 \else
-	\ifodd\value{r2}
-		\greatclub
+	\ifodd\value{r3}
+		\greatsword
+	\else
+		Nothing.
 	\fi
 \fi
-\greatclub\ifnumcomp{\thechapter}{>}{8}{, \thepage sp}{}}% EQUIPMENT
+\ifnumcomp{\thechapter}{>}{8}{, \thepage sp}{}}% EQUIPMENT
 {}
 }