diff --git a/combat.tex b/combat.tex
index a5c9da485a5effe4418feab2967a1227747dd030..8ff87b16d96527e9277b5c1cc66aefcdf15ad3c5 100644
--- a/combat.tex
+++ b/combat.tex
@@ -395,10 +395,6 @@ They work just as short bows, but their Damage is the normal weapon Damage -2.
 
 Weapons which were never made to be thrown, such as swords, axes, or most knives, receive a -2 penalty to hit for every 5 squares distance from the target, and a -2 penalty to Damage.
 
-\iftoggle{verbose}{
-  \input{story/12-advanced.tex}
-}{}
-
 \subsection{Weight}
 \index{Weight}
 
@@ -659,11 +655,11 @@ Characters caught in mud, who slip over, or get shackled to a spot cannot move o
 All attacks against them count as Sneak Attacks.
 Despite the Sneak Attack Bonus, such characters can defend as normal, with their full Dexterity Bonus, and any weapon bonuses.
 
-\subsubsection[Falling Prone: Same as `Trapped', but characters can spend a movement action to get up]{Falling Prone}
+\subsubsection[Falling Prone: -2 penalty when on the ground]{Falling Prone}
 \index{Prone}
 \label{prone}
 
-Characters who fall over lose their ability to defend themselves, as above.
+Attacks against a \textit{Prone} target gain a +2 bonus.
 However, they can get up as by spending 1 \gls{ap}.
 
 \subsection{Manoeuvres}
@@ -752,10 +748,6 @@ Strong characters might also can sacrifice the use of 1 point of Strength to pus
 
 Characters who have been rammed must be able to move far back enough as part of their normal movement action, otherwise they fall \textit{Prone}.
 
-\iftoggle{verbose}{
-  \input{story/11-ram.tex}
-}{}
-
 \subsubsection[Sneak Attack: +2 to attack and +2 Damage. Surprised enemies cannot resist.]{Sneak Attacks}
 \label{sneakattack}
 \index{Combat!Sneak Attack}
@@ -808,10 +800,6 @@ Shields can be strapped to the arm, without requiring any kind of dual-wielding.
 
 When an enemy flees the scene after a fight has begun, characters still gain full \gls{xp} for the fight, since they still `defeated' the enemy.
 
-\iftoggle{verbose}{
-  \input{story/13-morale.tex}
-}{}
-
 \end{multicols}
 
 \moralechart
diff --git a/config b/config
index d165a80d803ebfcaec69446f8ca3cea29c5d7dcf..703f9f195ff06d7120e4093678358be1ef2e6b3d 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit d165a80d803ebfcaec69446f8ca3cea29c5d7dcf
+Subproject commit 703f9f195ff06d7120e4093678358be1ef2e6b3d
diff --git a/story/1-intro.tex b/story/1-intro.tex
index b6f2e4e13cd4d42ff2461a4f006943520a8f17d7..b34bc54da4ec52bc7117e242bf4973139a8983c2 100644
--- a/story/1-intro.tex
+++ b/story/1-intro.tex
@@ -1,5 +1,3 @@
-\iftoggle{verbose}{
-
 \begin{exampletext}
 
 The skinny man greets Sean with overbearing enthusiasm as he continues to explained the mission.
@@ -36,6 +34,3 @@ Do you think your friends would be interested?}''
 The wizard smiled again.
 
 \end{exampletext}
-}{}
-
-
diff --git a/story/10-combat.tex b/story/10-combat.tex
index b1c51d9b19e92238824b0c662e0d6a2a107931b8..66f33b01a371ff721e319cacfc3c39ee9fee97a0 100644
--- a/story/10-combat.tex
+++ b/story/10-combat.tex
@@ -10,77 +10,97 @@ No, they would have to stick together to survive.
 The trio climbed for a while longer, looking back every few moments to note how close the hobgoblins were behind them. An ogre was among their ranks, so they must have come from a very deep cavern.
 
 Looking back, the enemy was nearing and everyone was out of breath.
-Arneson suggested a rest to make sure they would be ready for the fight - they could fight downhill against an enemy fatigued from walking upwards.
-He calmly got out the rations - some cheese, smoked pork, oatcakes and a flagon of wine.
-
-``May as well have the best of the rations now, eh, friends?'', Arneson said while smiling, and they slowly masticated their age-hardened meal and tried to smile back as the nine foot monstrosity which was so recently a man made its way up to them, pounding its great feet up the mountainous slopes, surrounded by half a dozen hobgoblins, each the size of a broad-shouldered man.
-
-As the hobgoblins neared the plateau where the trio sat they began to make their war cries, but Arneson just sat and ate his last oatcake slowly. They began to sprint upwards across the rocky ground.
-
-The \gls{gm} decides that since the players have the higher ground, they will receive +1 to all rolls until the hobgoblins can reach slightly higher ground - probably after the first action.
-One of the players must roll Initiative, so Arneson's player take the dice and rolls, producing a `5'.
-Each character's Initiative Bonus adds to this separately, so Sean's Initiative of +1 gives him a total of 6; Hugi's Initiative of +0 gives him a total of 5 and Arneson's Initiative Bonus of +2 makes his total 7.
-The group then gain +1 each due to the higher ground.
-Meanwhile, the hobgoblins have rolled a `5' for their Initiative as well.
-The hobgoblins each have a +1 bonus to Initiative and the ogre has a +0 bonus.
+Arneson suggested a rest to make sure they would be ready for the fight -- they could fight downhill against an enemy fatigued from walking upwards.
+He calmly got out the rations -- some cheese, smoked pork, oatcakes and a flagon of wine.
 
 \pic{Boris_Pecikozic/nura_brawl}{\label{boris:brawl}}
 
-The \gls{gm} knows the highest Initiative total is somewhere under 9 so she calls out,
-
-``Ten! The hobgoblins gather at the base. Nine! They cover their faces with their weapons and gang together. Eight! They push forwards and ....''
-
-``Eight!'' shouts Arneson's player. ``I'm going at eight! \ I'm going for the ogre - you said he was unarmoured so we should be able to take him down with a couple of good hits''.
-
-Arneson's player needs to roll an 8 to hit the ogre, so he rolls and adds +1 for his Combat Skill. His total is `11' and he hits. He has already rolled his damage die at the same time. It landed on a `2'. He adds +2 for his Strength and +1 for the sword's Damage bonus for a total of 5. The ogre shrieks in pain as Arneson's sword sticks in. Arneson's action took 6 Initiative points so he goes down to `2', and the hobgoblin has spent 2 Initiative to defend himself.
-
-``Seven!'', she cries.
-Sean's player jumps in.
-He only deals $1D6+2$ Damage but he has a much better Combat Skill of +2.
-He rolls to Strike but misses the ogre with a `5'.
-His Initiative score reduces to 1, and he reduces the hobgoblin's from 6 to 4.
-
-``Six!'', beckons the \gls{gm}, and starts to describe leering hobgoblins stabbing at everyone's feet from the base of the great stone step the trio are sitting on. She gives them each a -1 to attack due to occupying the lower ground.
-
-A hobgoblin hits Arneson, so he spends 2 Initiative to attempt to Dodge. Arneson rolls a 7 but the \gls{tn} is 10.
-The hobgoblin's Strength is +2 and the battle axe adds +3 Damage for a total of +5.
-4 of the Damage is replaced with a die, so the hobgoblin is rolling $2D6+1$ Damage.
-The total is 6.
-Arneson's player first reduces that by his chainmail's \gls{dr} of 4, leaving 2 Damage.
-Instead of taking that Damage he marks off 2 \glsentrylongpl{fp} and declares that the attack in fact misses.
-
-Hugi finally releases his crossbow, but in all the confusion misfires. He's down to Initiative 1.
-
-\needspace{3cm}
-\begin{wrapfigure}{r}{.3\textwidth}
-
-  \begin{tabularx}{.3\textwidth}{c|X}
-    \setcounter{enc}{12}
-
-    8 & Arneson deals 5 Damage to a hobgoblin. \\
-
-    7 & Sean misses. \\
-
-    6 & Most hobgoblins attack. \\
-
-    5 & Ogre grabs Hugi, then runs away. \\
-    4 & Two hobgoblins attack. \\
-
-  \end{tabularx}
-
-\end{wrapfigure}
-
-``Four!'', shouts the \gls{gm}, then she smiles. The next hobgoblin attacks and Arneson rolls a 5 -- that's a failure with a Margin of 4, so it bypasses his chainmail. The axe is coming down towards his unarmoured shin-bone and the Damage rolled is 9. He marks off his last 9 \gls{fp} rather than taking any Damage. Any further Damage is coming straight off his \gls{hp}.
-
-``The ogre pushes forward with its club then reaches out to grab Hugi. Roll at \glsentrylong{tn} 9''.
-
-Hugi's player isn't happy, as that is enough to hit him, or in this case grab him. In fact with his crossbow out rather than a defensive weapon, he'll have a hard time defending himself.
-
-The ogre reached forward, grabbing Hugi by the beard and pulling him back through the horde of hobgoblins and out from the protection of his companions.
+``May as well have the best of the rations now, eh, friends?'', Arneson said while smiling, and they slowly masticated their age-hardened meal and tried to smile back as the nine foot monstrosity which was so recently a man made its way up to them, pounding its great feet up the mountainous slopes, surrounded by half a dozen hobgoblins, each the size of a broad-shouldered man.
 
-The other players want to attack the ogre, but he's making a movement action -- these count as \gls{quickaction} so they are allowed to operate before other actions.
-Hugi disappears behind the crowd.
-The ogre's Initiative reduces to 0 and he is done for the \gls{round}, but Arneson and Sean each have one action left.
+As the hobgoblins neared the plateau where the trio sat they began to make their war cries, but Arneson just sits and ate his last oatcake slowly. They began to sprint upwards across the rocky ground.
 
 \end{exampletext}
 
+\sideBySide{
+  The \gls{gm} decides that since the players have the higher ground, they will receive +1 to all rolls until the hobgoblins can move up to where the \glspl{pc} stand.
+
+  The \glspl{pc} have no need to fight, so they don't need to spend \glspl{ap} on movement, so they wait, while the hobgoblins have to spend their own \glspl{ap} on movement.
+}{
+  The hobgoblins scramble up the rocks desperately.
+  They look too hungry to cook you before eating you, or even make sure you're all dead.
+}
+
+\sideBySide{
+  Hugi's player rolls to fire at a hobgoblins.
+  $$\gls{tn} 6 - Dexterity (1) - Projectiles (1) = 4$$
+  The Damage is
+
+  $$ 1D6 + 3 = 8$$
+}{
+  Hugi has been winding up his crossbow with malice while the others ate.
+  He aims the bolt, but waits patiently until they come within a good range -- every enemy matters when you're outnumbered.
+
+  He lets loose, hitting one straight in the head.
+  The others don't seem scared -- just relieved they didn't lose their chance to feast.
+}
+
+\sideBySide{
+  Arneson's player declares an attack first, and goes for the ogre.
+  The ogre increases the \gls{tn} of 8 with his stats:
+  $$Dexterity (0) + Combat (1) = 9$$
+  Arneson reduces the \gls{tn} with
+  $$Dexterity (0) + Combat (1) + Longsword (2) = 3$$
+  At \gls{tn} 6, he hits, and spends 2 \gls{ap} for the attack.
+}{
+  As the enemy ascend to striking range, the ogres claws at Arneson, and misses as Arneson steps to the side.
+  The step allows an oppening on the ogre's anterior side, and rushing in the sword enters the massive shoulder.
+}
+
+\sideBySide{
+  Arneson's Damage total is:
+  $$1D6 + Strength (2) + Longsword (2) = 1D6+4 = 2D6 = 4$$
+}{
+  The ogre shrieks in pain as Arneson's sword sticks in, and pulls away, eying up an easier breakfast.
+}
+
+\sideBySide{
+  Hugi's player defends against the ogre's attack.
+  $$\gls{tn} 8 + ogre (1) - Hugi (2) = \gls{tn} 7$$
+  He rolls a `5', which misses.
+  The ogre spends 1 \gls{ap} to move back, and Sean spends 1 to follow.
+}{
+  The ogre's eyes land on Hugi, so he grabs the dwarf by his beard and yanks him back while stepping back, behind the hobgoblins, who move in for the attack, leaving Arneson surrounded.
+
+  Sean shouts after his companion, circles around the dangerous side of a hobgoblin, and jumps towards the ogre to save his companion.
+}
+
+\sideBySide{
+  Sean spends his last 2 \glspl{ap} to attack with his sword.
+  The ogre has grabbed Hugi, so he counts as \textit{Prone}, giving a +2 Bonus to attacks against him.
+  $$\gls{tn} 8 - Prone (2) - Combat (1) = \gls{tn} 5$$
+}{
+  Sean lands on the ogre sword-first, the ogre writhes and its deformed rib-bones crack as the blade twists to the side.
+  Hugi begins to crawl out from underneath.
+}
+
+\sideBySide{
+  Arneson's player rolls for 3 Attacks, and spends \glspl{fp} to mitigate most of the damage, but marks off 2 \glspl{hp}.
+  The third attack reduces Arneson's \glspl{ap} to -2, giving him a -2 penalty.
+
+  \vspace{1em}
+  \begin{tabular}{l|cc}
+  Event & Areson's \glspl{ap} & and \glspl{fp} \\\hline
+  Hobgoblin attacks & 2 & 10 \\
+  Hobgoblin attacks & 0 & 6 \\
+  Hobgoblin attacks & -2 & 0 \\
+  \end{tabular}
+
+}{
+  Three hobgoblins had rushed to Arnesons front, and now pull their maces up to bring down upon him.
+  He thinks he can take one, but doesn't know about the other.
+
+  The first, he stabs, and it falls back bleeding.
+  The second swings for his head, but intersects with the rocky ground as he slips to the side.
+
+  He wobbles, confused, as the last stabs him the side with a dagger.
+}
diff --git a/story/11-ram.tex b/story/11-ram.tex
deleted file mode 100644
index a7cba791774ebd853fa0f49afdf3ef5690a256e0..0000000000000000000000000000000000000000
--- a/story/11-ram.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-\begin{exampletext}
-
-  Arneson decides he is going to \textit{ram} the crowd of hobgoblins to save his friend.
-  Pushing the half dozen hobgoblins back is going to be tricky.
-  He launches himself from the stony step they are on, pushes his chest into one then grabs two more hobgoblins.
-  Since he is pushing back 2 extra figures, he takes a -2 penalty to the action.
-  Arneson's rolling with +2 from his Strength Bonus and +1 bonus for his Combat Skill for a grand total of +1.
-  The \gls{tn} is 7 plus the hobgoblins' Strength of +2 and Combat Skill of +2 for a total of 11.
-  The \gls{gm} allows him a total of a +2 bonus for jumping off the step.
-  The dice come up with an 8 and his total of +3 just passes the test.
-  Normally, he would only push the hobgoblins back by 1 step, but they are on the side of a cliff and being pushed onto their back feet.
-
-  The \gls{gm} decides some sort of check is in order to see how well the hobgoblins perform.
-  Ordinarily, she would roll for each of them but there are six of them and that will take too long.
-  Thinking quickly - because who wants to slow down combat? - she decides that all of them could potentially fall down the cliff since the first three are in front of the next three so Arneson is pushing against all of them one way or another.
-  She gives them a \gls{tn} of 9 to stay up and a bonus of +6 because there are 6 of them.
-  Each Margin they roll in the final score is one hobgoblin that has not fallen over.
-  Dice clatter, she has rolled a `4' and that leaves a final score of 10.
-  Everyone falls down the mountain's steep incline except for a single hobgoblin.
-
-  Sean, on Initiative 1, is the last to act.
-  He jumps off the cliff-side to attack the last hobgoblin.
-  He strikes with a score of 11, bypassing the ugly creature's Partial chain armour, then rolls $1D6+2$ for the Damage for a total of 4.
-  The creature is reduced to half its \glspl{hp} with a crimson gash across its throat.
-
-  As Sean's sword swooped down it opened up his target's arm. The last one standing cries out and withdraws his arm then backs off.
-
-  ``End of the \gls{round}!'', cries the \gls{gm}. ``Round two! Roll for Initiative''.
-\end{exampletext}
-
diff --git a/story/12-advanced.tex b/story/12-advanced.tex
deleted file mode 100644
index c2910540a01981bd75626af9ba587e851380d1f7..0000000000000000000000000000000000000000
--- a/story/12-advanced.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-\begin{exampletext}
-
-
-The players start by assigning their Combat Skill.
-On the last \gls{round}, they left it as the default - it added to the Strike Factor.
-Arneson repeats the move and Hugi has no Combat score to speak of, but Sean has Combat +2.
-He knows speed is of the essence if he wants to save his friend, so he adds +2 to his Initiative Factor, giving him a total of +3.
-
-The characters roll to get their bearings but achieve only a `4', so Sean will act at Initiative 7.
-The \gls{gm} rolls for the hobgoblins and achieves `9' - with Speed +1 they will act on Initiative 10.
-
-\vspace{1em}
-
-\begin{tabularx}{.3\textwidth}{c|X}
-\setcounter{enc}{12}
-
-10 & The Ogre grapples Hugi. \\
-
-7 & Sean moves to stab the Ogre. \\
-
-6 & The Ogre deals 5 Damage. \\
-
-5 & Sean kills the ogre. \\
-
-\end{tabularx}
-
-\vspace{1em}
-
-``Twelve!'', the \gls{gm} rolls a Morale Check for that last hobgoblin. It is wounded and outnumbered. The \gls{tn} is 12 and it can add its Combat bonus, but the roll still fails.
-
-``The last hobgoblin backs up. \textit{Eleven!} It flees down the mountain towards its allies, many of whom are still rolling down the hill.''
-
-``Ten!'', the \gls{gm} continues, and immediately rolls for the ogre as it tries to eat Hugi's face off.
-This will count as a grappling roll, so he and Hugi will use double their Strength Bonus added to their Combat Skill.
-Unfortunately Hugi has neither Strength Bonus nor Combat Skill, so the ogre gets a straight +12 bonus; the roll succeeds before it is even made, and succeeds by a margin of 3: that means Damage is inflicted, rather than just Fatigue Points.
-The ogre only adds Strength - of course his massive club is useless for the attack.
-His Strength of +5 means he will roll $2D6+1$ Damage for a total of 4. Hugi is safe for now as the ogre luckily bites down on dwarvish helmet as Hugi's player marks off 4 \glspl{fp}.
-
-``Nine! The ogre pulls Hugi down. Eight! He bites down on Hugi's face but gets a mouthful of helmet instead. Seven!''
-Sean's player is acting now and takes two Initiative to run over to aid Hugi.
-He asks the \gls{gm} if he can sneak up on the ogre.
-
-``You mean in the middle of a fight you want to backstab someone?''
-
-``Sure. He's busy eating Hugi's face, so can I stab him while he's not bothering to avoid it?''
-
-The \gls{gm} thinks about it - the action is not clearly covered in the rules, so she decides the following.
-
-``Okay - make a sneak roll.
-If he sees you then he's going to stop the action and defend himself, otherwise your next attack can count as a Sneak Attack. Roll Speed + Stealth at \glsentrytext{tn} 6.''
-
-Sean has no bonus to either, but that ogre is so dim the test is easily passed. 
-
-``Six! The ogre gnaws into Hugi's face, this time without failure. 5 Damage!''
-
-Hugi's player marks off his last 3 \glspl{fp} then 2 \glspl{hp}, noting that he could have just died.
-
-Arneson runs over to aid the fight.
-
-``Five! Sean rolls for attack''
-
-His Sneak Attack gives him +4 to strike the ogre - which he does - and +2 Damage, making his Damage roll $2D6$. His total is 7 Damage.
-
-``Launching himself forward he lands the tip of his sword into the ogre's back just as teeth are sinking into the dwarf's face.
-It finds purchase and slides in only six inches before stopping.
-The giant whirls \gls{round}, ripping the sword out and pushing Sean to the side.
-He screams and attempts to get up, then slumps back down onto the dwarf, blood pooling out of the gash on his back.''
-
-``Finally!'', shouts Sean.
-We're done.
-It's finished.
-We can\ldots
-
-``Four! Over a dozen hobgoblins can be seen marching down from the mountain.'', shouts the \gls{gm}.
-
-``What? \ We can't handle any more. Hugi's Damaged. Arneson's in poor shape too.''
-
-``Three! \ They pull out crossbows and start cranking them {\dots}''
-
-\end{exampletext}
diff --git a/story/13-morale.tex b/story/13-morale.tex
deleted file mode 100644
index 6adff7a055fed42669d1d1f372c6973baf19c86a..0000000000000000000000000000000000000000
--- a/story/13-morale.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-
-\begin{exampletext}
-
-Sean's mind was racing -- searching for anything to help he remembered his acting classes, the roar they taught to open a grand scene and how actors said their roar was such that it would terrify local ruffians around the town.
-
-Sean's player asks the \gls{gm} about making a moral check for the hobgoblins.
-
-``Well'', she ponders, ``you certainly don't outnumber them.
-They are not half dead.
-They might make a moral check at \gls{tn} 4 but they would get a +1 bonus for their Combat Skill.
-So no, not really.
-They are not terrified of Sean waving his sword about, even if he took acting classes''.
-
-So much for that plan.
-
-\end{exampletext}
diff --git a/story/14-run.tex b/story/14-run.tex
index b011a89f9aea1d6617f72b8b1a8a7b74673499de..48fbd3b415804860b384943b8677a9fc61e0e676 100644
--- a/story/14-run.tex
+++ b/story/14-run.tex
@@ -1,27 +1,10 @@
-\begin{exampletext}
-
-Sean's next plan was to run away as fast as possible.
-This was much more popular than his last plan of yelling at the enemy, though Hugi found it hard to move enthusiastically with an arrow in his shoulder.
-The hobgoblins of course realised that they had no time to reload so they just gave chase.
-They dropped their projectiles, pulled out their shortswords and started to clamber along the rocky face of the mountain.
-The trio could not move clearly up the mountain until they had gained some ground between themselves and the hobgoblins, and feared that there would be more openings to once-dwarven tunnels, now infested with hobgoblins, if they went further up from their present location.
-
-The basic \gls{tn} for such actions is 6 and the \gls{gm} lowers it by 2 because the trio have a good head start.
-The hobgoblins add their Speed Bonus of +1 for a final \gls{tn} of 5.
-The party roll an 8 but unfortunately Hugi isn't the fastest of people -- he's only four feet tall after all -- so his score is 7.
-They needed that 8 to completely get away.
-Arneson and Sean decide they're going to keep pace with him rather than running ahead.
-They're not caught yet, but run through three different distinct areas before making another roll.
-
-The hobgoblins were fast on their trail as they clambered over the rocky mountain side.
-They soon headed up steeper, overhanging rocks and at one point had to help each other upwards across large rocks jutting out of the side as the hobgoblin horde came ever closer.
-Finally, they reached the peaks and gazed down the other side.
-Seeing only mist in the other side they decided to lose themselves in the crevices there before the enemy could catch up enough to see their direction.
-
-Arneson's player wants to roll again while adding his +2 Stealth Skill. He is the only one with this Skill but the \gls{gm} says he can use it to help everyone hide.  Arneson's player takes the dice and rolls; he scores 11.
-
-They didn't go far, but only hopped down a few stony crevices before Arneson beckoned them to the side and requested they creep into a nook he had found.
-Hugi and Sean could only just fit, with no spare room, so Arneson then bounded off to see what else he could find.
-He was still out looking for a spot when the great axes scraping down the cliff could be heard, and guttural voices complained about dangerously empty stomachs.
-
-\end{exampletext}
+\sideBySide{
+  Everyone makes a \textit{Group Roll} at \gls{tn} 9 to escape.
+  The dice land on a `10', so everyone travels through 2 areas, then escapes.
+}{
+  Arneson sees his companions sprinting away, and decides it's time for him to leave too, before more hobgoblins surround him.
+
+  The trio sprint up the mountain, entering a slippery area, where the waters have softened the earth and left mosses growing over every rock-face.
+  The hobgoblins struggle with keeping, and a steep slope greets them soon after.
+  Grabbing onto the sickly, little trees which live this high up, they enter a low cloud, and start to job, then stumble, and finally talk about hiding.
+}
diff --git a/story/15-fatigue.tex b/story/15-fatigue.tex
index 67c4ecdef9b2e50fa39646e50ed54206cb92d55c..2bbcc64243f1f23c7feeae3bd662de4ed6ea2411 100644
--- a/story/15-fatigue.tex
+++ b/story/15-fatigue.tex
@@ -3,53 +3,48 @@
 
 ``I've got 10 \glsentrylongpl{fp} in total'', mentions Arneson's player, ``So I'm getting 4. But doesn't this rest period count as a new scene too?''.
 
-``Sure, says the \gls{gm}. ``Mark down another load for hiding in the tops of the mountains.''
+``Sure, says the \gls{gm}. ``You can regain four more \glsentrylongpl{fp} for hiding in the tops of the mountains.''
 
-With their \gls{fp} now replenishing quickly, the group can rest and worry less about being hit again.
+With their \glspl{fp} now replenishing quickly, the group can rest and worry less about being hit again.
 
 ``Oh! I've been forgetting about the Fatigue'', says the \gls{gm}. Your \gls{gm} will probably say the same at some point.
 
-``Everyone got two Fatigue from being in two \glspl{round} of combat, then four more for running through three areas.
-That's six in total''.
+``Everyone got 1 \glsentryfull{fp} from being in one \gls{round} of combat, then three more for running through three areas, so that's four in total.
+Once you rest for the scene, you should be fine.
 
 \vspace{1em}
 
-\needspace{3em}
-
 \textbf{Hit Points and Fatigue}
 
-\begin{tabularx}{\linewidth}{ccccccccccc}
+\begin{tabularx}{\linewidth}{cccccccccc}
 
 \Repeat{7}{\ding{108} & }
 \Repeat{2}{\ding{109} & }
 \ding{109} \\
 
-\Repeat{5}{\sqr & }
-\Repeat{4}{\sqn & }
+\Repeat{4}{\sqr & }
+\Repeat{5}{\sqn & }
 \sqn \\
 
 &&&&&&& -1 & -2 & -3 \\
 
 \end{tabularx}
 
-Sean's player starts by putting down two \glspl{fatigue} for the two rounds of combat.
-His armour has a \gls{weightrating} of 0, so it doesn't add \gls{fatigue}.
-He receives three \gls{fatigue} for running across the mountain.
-Five Fatigue Boxes are marked down in total.
-If the characters had continued being active that would be the end, but since they have finished the scene while resting, Sean heals 4 Fatigue points leaving him with only 7 in total.
-
-Hugi isn't doing so well. He only had 2 \glspl{hp} left by the time he was running.
-He gains the full 7 \glspl{fatigue}.
-Finally, the \gls{gm} reminds him that he is bleeding from his wounds.
-He is in no condition to patch them up while hiding, especially since nobody in the party knows anything about Medicine.
-She decides to only award one more Fatigue point since the arrow is also stopping the wound from bleeding too much - that makes the total 8.
-Hugi's rest allows him to regenerate 3 Fatigue Points (he's not as strong as Sean) so he receives 5 Fatigue Points in total.
-Dwarves, luckily, can withstand 2 additional Fatigue Points so 2 of those points give him no penalty.
-That's 6 more than his \glspl{hp}.
-He gains a -4 penalty to all actions.
-The danger now passed, the warriors lie in their hiding nooks, watching the cold clouds whirl around them, hoping to never see any kind of goblin again.
-They breathe in and out gently, waiting for the heaviness in the chest to subside.
-Despite the winds, Sean can hear a gentle drip, drip, drip from the slowly bleeding wound on Hugi's shoulder where an arrow still lies.
+Unfortunately, Arneson lost 5 \glspl{hp} during the fight, so with only 3 \glspl{hp} left, he only heals 2 \gls{fatigue}.
 
-\end{exampletext}
+\vspace{1em}
+\begin{tabularx}{\linewidth}{cccccccccc}
+
+\Repeat{7}{\ding{108} & }
+\Repeat{2}{\ding{109} & }
+\ding{109} \\
 
+\Repeat{2}{\sqr & }
+\Repeat{7}{\sqn & }
+\sqn \\
+
+&&&&&&& -1 & -2 & -3 \\
+
+\end{tabularx}
+
+\end{exampletext}
diff --git a/story/2-cc.tex b/story/2-cc.tex
index 56c27d6992dedc19e5c98821ee8ecd712555bdad..094531f8f81e4214cf6dabda90ac152b28cde084 100644
--- a/story/2-cc.tex
+++ b/story/2-cc.tex
@@ -7,7 +7,7 @@
 After rolling the dice, my final results are Strength +1, Speed 0, Dexterity -1, Intelligence 0, Wits -1 and Charisma +1.
 That doesn't look like it speaks of much, but consider what kind of human might be `Charismatic yet clumsy'.
 Perhaps a noble?
-It could be a performer, but what kind of performer doesn't have the coordination to play the difficult songs on the banjo? A poet! Imagine a minor noble, perhaps the third son of a townmaster or some such.
+It could be a performer, but what kind of performer doesn't have the coordination to play the difficult songs on the banjo? A poet! Imagine a minor noble, perhaps the third son of a baron or some such.
 He's always rushing about then falling over.
 His poems aren't terribly good (just look at that banal Intelligence score) but he can get better.
 Meanwhile, he earns his pay, and perhaps attempts to chat up a few ladies, based on his dashing good looks and likeable personality.
diff --git a/story/7-resisted.tex b/story/7-resisted.tex
index 90771187e8394d606f5d515ef5b727b52846c46f..bdb76dbea21e40ff231acbc6ec1040491a480c46 100644
--- a/story/7-resisted.tex
+++ b/story/7-resisted.tex
@@ -15,7 +15,7 @@ The smell of roasted meat is coming from human flesh roasting over each fire in
   On the one hand, it is dark (which makes hiding easier) and there are some signs of battle in the village, such as blood on the grass.
   On the other hand, the darkness stops the characters seeing the signs of battle.
   She decides that the various factors cancel each other out and keeps the base \gls{tn} of 7.
-  She adds the hobgoblins' score to this - the highest score counts since any of of the hobgoblins might spot the characters, but all the hobgoblins have the same score.
+  She adds the hobgoblins' score to this -- the highest score counts since any of of the hobgoblins might spot the characters, but all the hobgoblins have the same score.
   They have Wits -1 and no Vigilance Skill; the hobgoblins' score is added to the \gls{tn} for a final \gls{tn} of 6.
   Meanwhile, Sean still has a Wits + Vigilance total of -1.
 
diff --git a/story/8-hiding.tex b/story/8-hiding.tex
index 80d3178ddae9e45722f9d9f0c34eab6a095c84cd..b24fba35f6f970cbd87d06ecf4902b2c19e21fb5 100644
--- a/story/8-hiding.tex
+++ b/story/8-hiding.tex
@@ -6,7 +6,7 @@
   The character with the highest score is Arneson, with Wits 0 and Vigilance +1.
   The \gls{gm} decides that the hobgoblin should use his Speed Bonus of +1, and his Stealth Skill adds +1 again.
   The hobgoblins' score of +2 adds to the basic \gls{tn} of 7, producing a final \gls{tn} of 9.
-  Arneson's player rolls $2D6$ to produce a final score of `12' - the roll is a success and the margin is 3.
+  Arneson's player rolls $2D6$ to produce a final score of `12' -- the roll is a success and the margin is 3.
   Since the margin is quite good, the \gls{gm} decides that the troop leave the area before they are engaged and gain a +3 bonus to running away.
 
   The thatched roof on the nearby cottage rustled and Arneson instinctively drew his companions back.
diff --git a/story/encumbrance.tex b/story/encumbrance.tex
index 85a1084afe0f6326d71062cdf630b9b34e779ec1..9f97d23669cdf556d9ca969ea6d20de0406544b1 100644
--- a/story/encumbrance.tex
+++ b/story/encumbrance.tex
@@ -2,8 +2,8 @@
 
   For example, Sean, with a Strength Bonus of +1, picks up a weighty battle axe.
   The \gls{weightrating} is 3, so this inflicts an Encumbrance Penalty of 2.
-Sean's effective Speed Bonus drops to -2, reducing his Initiative (covered below) and ability to run.
-He will also gain 2 Fatigue points at the end of each scene\footnote{See page \pageref{time} for notes on scenes.} where he carries it.
+Sean's effective Speed Bonus drops to -2, reducing his \glspl{ap} (covered below) and ability to run.
+He will also gain 2 \glspl{fatigue} at the end of each scene\footnote{See page \pageref{time} for notes on scenes.} where he carries it.
 
 \end{exampletext}