diff --git a/Makefile b/Makefile
index 0beeca99b6375cedfe47d323229627dec93ee3c5..08b8c67bc500a2e31db470008a097b93a318b8e6 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,6 @@ all: ref ${filename}.pdf resources.pdf creds
 tree:
 	[ -e ../config ] || ( echo "You don't have a local config repo" && exit 1 )
 	git status
-	git subtree -P config pull ../config ${branch}
+	git subtree -P config pull ../config ${branch} -m'pull config'
 clean:
 	rm -fr *.aux *.toc *.acn *.log *.ptc *.out *.idx *.ist *.glo *.glg *.gls *.acr *.alg *.ilg *.ind *.pdf .ref svg-inkscape
diff --git a/cc.tex b/cc.tex
index 06a6070b768c13f70df7ccc56722645f5fe7be93..88f8744a1eea168d805875cf010c7fbc1d846ea1 100644
--- a/cc.tex
+++ b/cc.tex
@@ -148,8 +148,8 @@ These are the basic Traits which characters must use over and over again for eve
 \index{Body Attributes}
 \index{Physical Attributes}
 
-\sidebox[28]{
-\begin{boxtable}
+\sidebox[27]{
+\begin{boxtable}[Xc]
 
 	Result & Attribute Bonus \\\hline
 
diff --git a/combat.tex b/combat.tex
index 25be600bc572b9be8e1de351b3f61405e9ae5e5a..d1e3da53324c15a4014f3a7a0afc83f0fce1eedc 100644
--- a/combat.tex
+++ b/combat.tex
@@ -113,10 +113,12 @@ Each character then adds their \textit{Initiative Factor} to get their Initiativ
 The Initiative Factor is given by characters' Speed Attribute plus weapon modifiers.
 If you roll 5 and have a Speed Bonus of 1, your Initiative Score is 6.
 
-\begin{figure*}[t!]
-\footnotesize
-\initiativechart
-\end{figure*}
+\iftoggle{verbose}{}{
+	\begin{figure*}[t!]
+	\footnotesize
+	\initiativechart
+	\end{figure*}
+}
 
 The \gls{gm} then counts downwards from the highest Initiative score.
 When your number comes up, you can act.
@@ -148,6 +150,10 @@ For example, you can move, then Keep Edgy, even after you're too disoriented to
 Meanwhile, Keeping Edgy requires no roll and has no associated numbers, so it does not incur any penalty.
 However, defending oneself after this point would have a -2 penalty, and further \gls{quickaction} would suffer a -3 penalty.
 
+\iftoggle{verbose}{
+	\initiativechart
+}{}
+
 \subsection{Attack}
 \label{attack}
 
diff --git a/knacks.tex b/knacks.tex
index 242e1b99e43aaef10465696e8e4b49be4009172c..306b90c86f31ce9a961372b18219e708f64a31f8 100644
--- a/knacks.tex
+++ b/knacks.tex
@@ -269,7 +269,7 @@ First level spells still require a full round to cast.
 
 \subsubsection{Chosen Enemy}
 
-The character has a burning hatred for a particular race of creature.
+The character has a burning hatred for a particular type of creature.
 The character gains a -2 penalty when interacting socially with such creatures and a +1 when performing actions such as tracking them, attacking them or intimidating them.
 The only combat bonus gained is for the Strike Factor, not Initiative or Evasion.