diff --git a/cc.tex b/cc.tex
index 2556953406ff3d21b2e60ee0c707f2a7f8da4e1a..3e14dd5dcdc66e6d216b8da0299ed2dd0a67d1d4 100644
--- a/cc.tex
+++ b/cc.tex
@@ -344,7 +344,7 @@ When thinking up a new Skill, try to think about how it would work with each Att
 
 	\begin{tcolorbox}[tabularx={cc},arc=1mm]
 
-		Question & \gls{tn} \\\hline
+		Question & \glsentrytext{tn} \\\hline
 
 		Simple & 7 \\
 
@@ -512,7 +512,7 @@ They worship \glsentrytext{knowledgegod}.\footnote{See page \pageref{gods_codes}
 {0}}% CHARISMA
 {0}% DR
 {0}% COMBAT
-{Academics 1, Crafts 1\Path{Alchemy}{Invocation 2, Illusion 1}}% SKILLS
+{Academics~1, Crafts~1\Path{Alchemy}{Invocation 2, Illusion 1}}% SKILLS
 {Dagger, 1 x adventuring equipment}% EQUIPMENT
 {\mana{2}}
 
@@ -534,7 +534,7 @@ The Craft and Empathy skills means the illusionist is best at making illusions o
 {0}}% CHARISMA
 {0}% DR
 {0}% COMBAT
-{Academics 2, Empathy 1, Crafts 1\Path{Alchemy}{Force 1, Invocation 2, Illusion 3}}% SKILLS
+{Academics~2, Empathy~1, Crafts~1\Path{Alchemy}{Force~1, Invocation~2, Illusion~3}}% SKILLS
 {\Dagger, \completeleather, 2 x adventuring equipment}% EQUIPMENT
 {\mana{4}}
 
@@ -556,7 +556,7 @@ Their starting equipment includes partial leather armour, camping equipment, a s
 {0}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Academics 1, Beast Ken 1, Survival 1\Path{Divinity}{Aldaron 1, Polymorph 1}}% SKILLS
+{Academics~1, Beast~Ken~1, Survival~1\Path{Divinity}{Aldaron~1, Polymorph~1}}% SKILLS
 {\spear, \partialleather, dagger}% EQUIPMENT
 {\mana{2}}
 
@@ -577,7 +577,7 @@ Water can be turned to slime or webbing, webs could be turned to water, and the
 {0}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Academics 1, Beast Ken 2, Survival 1\Path{Divinity}{Aldaron 2, Conjuration 1, Polymorph 3}}% SKILLS
+{Academics~1, Beast~Ken~2, Survival~1\Path{Divinity}{Aldaron~2, Conjuration~1, Polymorph~3}}% SKILLS
 {\partialleather, \spear, dagger, 1 x adventuring equipment}% EQUIPMENT
 {\mana{3}}
 
@@ -600,7 +600,7 @@ After gaining \gls{xp}, some adventuring clerics focus upon martial abilities, w
 {0}}% CHARISMA
 {0}% DR
 {0}% COMBAT
-{Academics 1, Medicine 1\Path{Divinity}{Fate 2}}% SKILLS
+{Academics~1, Medicine~1\Path{Divinity}{Fate~2}}% SKILLS
 {\quarterstaff, \partialleather}% EQUIPMENT
 {\mana{4}}
 
@@ -621,7 +621,7 @@ Those fighting could be forced to continue until they die from a sword or drop d
 {0}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Academics 1, Empathy 1, Deceit 1, Medicine 1\Path{Divinity}{Enchantment 3, Fate 2}}% SKILLS
+{Academics~1, Empathy~1, Deceit~1, Medicine~1\Path{Divinity}{Enchantment~3, Fate~2}}% SKILLS
 {\quarterstaff, \partialchain, medical equipment, 2 x adventuring equipment}% EQUIPMENT
 {\mana{4}\addtocounter{fp}{5}}
 
@@ -646,7 +646,7 @@ They follow the Code of Acquisition.
 {0}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Deceit 1, Larceny 1, Stealth 2\knacks{\perfectsneakattack}}% SKILLS
+{Deceit~1, Larceny~1, Stealth~2\knacks{\perfectsneakattack}}% SKILLS
 {\longsword, \completeleather, dagger, lock pick tools, 1 x adventuring equipment}% EQUIPMENT
 {\addtocounter{fp}{5}}
 
@@ -665,7 +665,7 @@ Alternatively, rogues may go the route of a singing socialite, and even learn to
 {1}}% CHARISMA
 {0}% DR
 {1}% COMBAT
-{Academics 1, Empathy 1, Deceit 2, Performance 2, Vigilance 1}% SKILLS
+{Academics~1, Empathy~1, Deceit~2, Performance~2, Vigilance~1}% SKILLS
 {\longsword, \partialleather, dagger, lantern, camping equipment, writing equipment, 2 x adventuring equipment.\Path{Song}{Fate 1, Enchantment 2}}% EQUIPMENT
 {\mana{2}\addtocounter{fp}{10}}
 
@@ -708,7 +708,7 @@ Those focussed narrowly on advancing in martial abilities can become deadly.
 {0}}% CHARISMA
 {0}% DR
 {2}% COMBAT
-{Deceit 1, Tactics 1\knacks{\adrenalinesurge, \charge, \firststrike}}% SKILLS
+{Deceit~1, Tactics~1\knacks{\adrenalinesurge, \charge, \firststrike}}% SKILLS
 {\longsword, \partialchain, \bucklar}% EQUIPMENT
 {\addtocounter{fp}{5}}
 
@@ -727,7 +727,7 @@ After progressing, particularly pious fighters can gain a level or two in Fate,
 {0}}% CHARISMA
 {0}% DR
 {2}% COMBAT
-{Academics 1, Deceit 1, Tactics 1\Path{Divinity}{Fate 2}\knacks{\adrenalinesurge, \finishingblow}}% SKILLS
+{Academics~1, Deceit~1, Tactics~1\Path{Divinity}{Fate 2}\knacks{\adrenalinesurge, \finishingblow}}% SKILLS
 {\longsword, \partialchain, \bucklar, 2 x adventuring equipment}% EQUIPMENT
 {\mana{2}\addtocounter{fp}{10}}
 
@@ -747,7 +747,7 @@ Whether this comes through prayer or inborn abilities which develop over time, a
 {0}}% CHARISMA
 {0}% DR
 {2}% COMBAT
-{Projectiles 1, Beast Ken 1, Survival 1, Tactics 1\Path{Blood}{Aldaron 2}\knacks{\mightydraw, \charge}}% SKILLS
+{Projectiles~1, Beast~Ken~1, Survival~1, Tactics~1\Path{Blood}{Aldaron 2}\knacks{\mightydraw, \charge}}% SKILLS
 {\longsword, \partialchain, \bucklar, bow, 2 x adventuring equipment}% EQUIPMENT
 {\mana{2}\addtocounter{fp}{10}}