diff --git a/glossary.tex b/glossary.tex
index 84b6fc6236286792ded150b4e27184ca6d62f6fb..c94a07a9c955a9a8d623d65b3e92401187eb9ef6 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -843,22 +843,6 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   In any case, the results are the same -- unpredictable},
 }
 
-\longnewglossaryentry{casting}{
-  name={Castings},
-  text={casting},
-  prefix={a\space},
-  parent={witchcraft},
-  type={mech},
-  category={rules},
-  description={start by spending one \glsentrytext{mp} per spell level.
-  The \glsentrytext{witch} then commands the target \glsentrytext{sphere}, rolling \roll{Charisma}{} the lowest \glsentrytext{skill} required.
-
-  When `overspending' on the \glsentrytext{invocation}, the \glsentrytext{witch} gains 1~\glsentrytext{ep} for each \glsentrytext{mp} they lack.
-
-  If nobody resists a spell, the \glsentrytext{tn} usually depends on its target.
-  Earth spells can affect ice far more easily than rocks, and Air spells can whip up a gale easier when outdoors},
-}
-
 \newacronym[
   name={Mana Points (MP)},
   shortplural={MP},
@@ -866,7 +850,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   prefixfirst={a\space},
   parent={witchcraft},
   description={grant every \glsentrytext{witch} their power.
-  When they run out, the caster gains one \glsentrytext{ep} for every point they cannot spend},
+  When they run out, they gain one \glsentrytext{ep} for every point they cannot spend},
   ]{mp}{MP}{Mana Point}
 
 \longnewglossaryentry{spell}{
@@ -880,15 +864,14 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   Once cast, they endure until they burn through themselves, or something destroys them.
   To stop a Fire spell, someone must put the fire out, and if an angry \glsentrytext{witch} makes antlers grow on someone's head, the only way to `dispel' them is with a boning knife.
 
-  Long-range spells cannot be reigned in; if the range is
+  Spells with a Distant range cannot be reigned in; if the range is
+  \toggletrue{Distant}%
   \setcounter{spellCost}{4}\setRange%
-  \spellRange, the spell will find the nearest target at that distance.
+  `\spellRange', the spell will find the nearest target at that distance.
 
   Casters only select a spell's first target.
   The spell forks through the others like lightning, and may `arc' across any distances up to its original range.
-  Water spells which hit a river will spread through the river, but a curse with an `area' of 4 will have to jump until it has found four people to inflict itself on.
-
-  To learn a spell, the caster's \glsentrytext{skill} must match each \glsentrytext{sphere}},
+  Water spells which hit a river will spread through the river, but a curse with an `area' of 4 will have to jump until it has found four people to inflict itself on},
 }
 
 \longnewglossaryentry{invocation}{
@@ -912,93 +895,43 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
     Each descriptor raises the \glsentrytext{mp} cost and mechanical effects by 1},
 }
 
-%%%%%%%%%%%%%%%% General Terms %%%%%%%%%%%%%%%%%%%%
-
-\longnewglossaryentry{ainumar}{
-  name={The Ainumar},
-  text={Ainumar},
-  plural={Ainumari},
-  sort={Ainumar},
-  category={indexed},
-  nonumberlist,
-  description={This massive planet has a raging storm across its face, much like our Jupiter.
-  Many think that the gods live here, planning how to kill people, and take their souls up to their houses.
-  Each god holds domain over a different death},
-}
-
-\longnewglossaryentry{fenestra}{
-  name={Fenestra},
-  nonumberlist,
-  description={This land, where elves, gnolls, and humans look up at trees, like ants moving through blades of grass.
-  Predators larger than a horse hunt deer and people in the same way, so everyone travels together, and well-armed},
-}
-
-\longnewglossaryentry{trade}{
-  name={Trade},
-  text={trade},
-  category={indexed},
-  parent={fenestra},
-  description={keeps civilizations alive.
-  Nowhere can sustain the \glsentrytext{guard} for long, as they need metal for weapons and armour},
-}
-
-\longnewglossaryentry{tradeTongue}{
-  name={The Trade Tongue},
-  text={Trade Tongue},
-  category={indexed},
-  parent={trade},
-  description={lets people trade, despite not sharing much of a common language.
-  It has about two hundred words, so people have to indicate what they want to say by lumping words together.
-  E.g. `cow' might be `white-water animal', and cheese could be `rock of white-water animal'},
-}
-
-\newacronym[
-  description={are the smallest unit of currency},
-  shortplural={cp},
-  name={Copper Pieces ({\scshape cp})},
-  type={main},
-  longplural={copper pieces},
+\longnewglossaryentry{witch}{
+  name={Witch},
+  text={witch},
+  plural={witches},
   prefix={a\space},
-  parent={trade},
-]{cp}{cp}{copper piece}
+  type={mech},
+  parent={witchcraft},
+  description={simply means anyone who can natural speak to an elemental \glsentrytext{sphere} using their inner \glsentrytext{mp} store.
+  These people have no special uniform, and often hide their talents},
+}
 
-\newacronym[
-  description={gets you 100 copper pieces},
-  name={Silver Pieces ({\scshape sp})},
-  type={main},
-  sort={silver piece},
-  longplural={silver pieces},
-  shortplural={sp},
+\longnewglossaryentry{casting}{
+  name={Castings},
+  text={casting},
   prefix={a\space},
-  parent={trade},
-  ]{sp}{sp}{silver piece}
+  parent={witch},
+  type={mech},
+  category={rules},
+  description={start by spending one \glsentrytext{mp} per spell level.
+  The \glsentrytext{witch} then commands the target \glsentrytext{sphere}, rolling \roll{Charisma}{} the lowest \glsentrytext{skill} required.
 
-\newacronym[
-  description={convert to ten silver, or a thousand copper pieces},
-  shortplural={gp},
-  longplural={gold pieces},
-  name={Gold Pieces ({\scshape gp})},
-  type={main},
-  sort={Gold Piece},
-  prefix={a\space},
-  parent={trade},
-]{gp}{gp}{Gold Piece}
+  When `overspending' on the \glsentrytext{invocation}, the \glsentrytext{witch} gains 1~\glsentrytext{ep} for each \glsentrytext{mp} they lack.
 
-\newacronym[
-  description={is the universal way to measure time in \glsentrytext{fenestra}, where one \glsentrytext{cycle} equals three `years'},
-  name={Gnomish Machine Time (GMT)},
-  prefix={a\space},
-  parent={fenestra},
-  type={main},
-]{gmt}{GMT}{Gnomish Machine Time}
+  If nobody resists a spell, the \glsentrytext{tn} usually depends on its target.
+  Earth spells can affect ice far more easily than rocks, and Air spells can whip up a gale easier when outdoors},
+}
 
 \longnewglossaryentry{alchemy}{
-  prefix={an\space},
   name={Alchemy},
-  symbol={\glsentrytext{R}},
   text={alchemy},
   sort={Alchemy},
-  description={is what alchemists do},
+  symbol={\glsentrytext{R}},
+  prefix={an\space},
+  type={mech},
+  parent={witchcraft},
+  description={is the practice of turning a raw magical \glsentrytext{ingredient} into something useful.
+  It requires no \glsentrytext{sphere} \glsentrytext{skill} to use -- just a recipe},
 }
 
 \longnewglossaryentry{sphere}{
@@ -1008,7 +941,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   type={mech},
   description={divide the world into meaningful parts.
   The five elemental Spheres are Fire, Air, Fate, Water, and Earth.
-  Each pair joins its neighbours, making the high Spheres; Light, Death, Mind, Life, and Force
+  Each one can join with two neighbours to make one of the high Spheres; Light, Death, Mind, Life, and Force.
 
   If a caster can think of a way to use any Sphere to stop an attack, they can enter combat as usual with their \roll{Charisma}{Sphere}, rolling at \glsentrytext{tn} 7 plus the \glsentrytext{npc}'s \roll{Dexterity}{Melee}.
   A battle-ready \glsentrytext{witch} might encourage a warrior's torch to burn his own face off, or make him forget what he wanted to do a moment before his sword comes down},
@@ -1020,7 +953,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   prefix={an\space},
   nonumberlist,
   category={indexed},
-  parent={witchcraft},
+  parent={alchemy},
   type={mech},
   description={are the basic materials used to make any \glsentrytext{boon}, or \glsentrytext{talisman}, and for lots of medicines.
   Each has an elemental affinity, so a Fire Ingredient can only make a Fire \glsentrytext{boon}},
@@ -1031,7 +964,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   text={Concoction},
   prefix={a\space},
   sort={concoction},
-  parent={ingredient},
+  parent={alchemy},
   category={indexed},
   type={mech},
   description={are liquids or powders which, when thrown in the air, hyper-charge the use of a single magic \glsentrytext{sphere}, for anyone present next to the burst.
@@ -1043,7 +976,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   name={Elixirs},
   text={elixir},
   prefix={an\space},
-  parent={ingredient},
+  parent={alchemy},
   category={indexed},
   type={mech},
   description={heal diseases.
@@ -1058,6 +991,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   firstplural={talismans (one-use alchemical items)},
   sort={Talisman},
   category={indexed},
+  type={mech},
   parent={alchemy},
   description={are spells, locked in an item, along with some activation condition.
   A talisman could open a magical gateway once it reaches a certain location, or bless the first person it sees with good luck.
@@ -1068,12 +1002,94 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   name={Artefacts},
   text={Artefact},
   prefix={an\space},
+  type={mech},
   parent={alchemy},
   description={happen, often by accident, when someone imbues sentience into an unused \glsentrytext{talisman}, then leaves it to contemplate its existence for a century.
   spells given sentience, and function as long-term magical items.
   They frequently go awry, as they have a mind of their own, and their own wishes and values},
 }
 
+
+%%%%%%%%%%%%%%%% General Terms %%%%%%%%%%%%%%%%%%%%
+
+\longnewglossaryentry{ainumar}{
+  name={The Ainumar},
+  text={Ainumar},
+  plural={Ainumari},
+  sort={Ainumar},
+  category={indexed},
+  nonumberlist,
+  description={This massive planet has a raging storm across its face, much like our Jupiter.
+  Many think that the gods live here, planning how to kill people, and take their souls up to their houses.
+  Each god holds domain over a different death},
+}
+
+\longnewglossaryentry{fenestra}{
+  name={Fenestra},
+  nonumberlist,
+  description={This land, where elves, gnolls, and humans look up at trees, like ants moving through blades of grass.
+  Predators larger than a horse hunt deer and people in the same way, so everyone travels together, and well-armed},
+}
+
+\longnewglossaryentry{trade}{
+  name={Trade},
+  text={trade},
+  category={indexed},
+  parent={fenestra},
+  description={keeps civilizations alive.
+  Nowhere can sustain the \glsentrytext{guard} for long, as they need metal for weapons and armour},
+}
+
+\longnewglossaryentry{tradeTongue}{
+  name={The Trade Tongue},
+  text={Trade Tongue},
+  category={indexed},
+  parent={trade},
+  description={lets people trade, despite not sharing much of a common language.
+  It has about two hundred words, so people have to indicate what they want to say by lumping words together.
+  E.g. `cow' might be `white-water animal', and cheese could be `rock of white-water animal'},
+}
+
+\newacronym[
+  description={are the smallest unit of currency},
+  shortplural={cp},
+  name={Copper Pieces ({\scshape cp})},
+  type={main},
+  longplural={copper pieces},
+  prefix={a\space},
+  parent={trade},
+]{cp}{cp}{copper piece}
+
+\newacronym[
+  description={gets you 100 copper pieces},
+  name={Silver Pieces ({\scshape sp})},
+  type={main},
+  sort={silver piece},
+  longplural={silver pieces},
+  shortplural={sp},
+  prefix={a\space},
+  parent={trade},
+  ]{sp}{sp}{silver piece}
+
+\newacronym[
+  description={convert to ten silver, or a thousand copper pieces},
+  shortplural={gp},
+  longplural={gold pieces},
+  name={Gold Pieces ({\scshape gp})},
+  type={main},
+  sort={Gold Piece},
+  prefix={a\space},
+  parent={trade},
+]{gp}{gp}{Gold Piece}
+
+\newacronym[
+  description={is the universal way to measure time in \glsentrytext{fenestra}, where one \glsentrytext{cycle} equals three `years'},
+  name={Gnomish Machine Time (GMT)},
+  prefix={a\space},
+  parent={fenestra},
+  type={main},
+]{gmt}{GMT}{Gnomish Machine Time}
+
 \longnewglossaryentry{cycle}{
   name={Cycles},
   text={cycle},
@@ -1118,15 +1134,6 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
   They make their own ale, and keep their own laws},
 }
 
-\longnewglossaryentry{witch}{
-  name={Witch},
-  text={witch},
-  plural={witches},
-  prefix={a\space},
-  parent={alchemy},
-  description={simply means any spell-caster, often used as a derogatory term for a dishonoured \glsentrytext{doula}},
-}
-
 \longnewglossaryentry{deep}{
   name={The Labyrinth},
   text={Labyrinth},