diff --git a/character/classes.tex b/character/classes.tex
index c7e601d..444a908 100644
--- a/character/classes.tex
+++ b/character/classes.tex
@@ -47,7 +47,7 @@ Classes are described in \cref{ch:combat-classes,ch:noncombat-classes}. The desc
 \chapter{Combat Classes}\label{ch:combat-classes}
 
 \begin{firstpar}
-    The first set of classes focuses on combat. Each of them specializes in their own way of dealing damage and controlling the battlefield.
+    The first set of classes focuses on combat. Each of them specializes in their own way of dealing damage and controlling the battlefield. From the stalwart guard, to the roguish swashbuckler, to the mysterious witch, their unique skills let them swiftly defeat their enemies, or protect their allies.
 \end{firstpar}
 
 \section*{Fighter}
@@ -57,7 +57,7 @@ Fighters are trained in the use of melee weapons and can use them to great effec
 \subsubsection*{Abilities}
 
 \begin{multicols}{2}
-    \paragraph*{Sure Strike} \tochange{Pay dice for damage.}
+    \paragraph*{Sure Strike} Remove up to your \stat{STR} dice from your dice pool. Deal damage appropriate to the number of successes equal to half the removed dice.
 \end{multicols}
 
 \subsection*{Guard}
@@ -73,15 +73,17 @@ A guard's main job is to protect their allies from attacks. They may not be trai
 \end{tabular}
 
 \subsubsection*{Abilities}
-
+\nopagebreak
 \begin{multicols}{2}
-    \paragraph*{Knockout} \tochange{Knock enemy unconscious}
+    \paragraph*{Knock out} Roll an opposed test with \stat{DT} $6-\stat{str}$. The opponent must win with \stat{DT} $6-\stat{stb}$, or become \textbf{\sffamily unconscious} for a number of turns equal to the difference in margins.
+
+    \paragraph*{Trip -- \textit{reaction}} If a target moves within range of your weapon, roll a test against \stat{DT} $6-\stat{dex}$. The target must win an opposed test with \stat{DT} $6-\stat{dex}$ or be knocked \textbf{\sffamily prone}.
 
-    \paragraph*{Trip -- \textit{reaction}} \tochange{Knock passing enemy to the floor}
+    \paragraph*{Prevent Escape -- \textit{reaction}} If a target leaves your attack range, you may perform an attack or use an ability against that target.
 
-    \paragraph*{Prevent Escape -- \textit{reaction}}  \tochange{Attack of opportunity}
+    \paragraph*{Hold the Line} Roll a test with \stat{DT} $6-\stat{stb}$ and note the margin of success. Next time someone within your range rolls a test, you may reduce the number of successes in their test by up to the number of successes you received, but not below 0.
 
-    \paragraph*{Hold the Line} \tochange{Prevent stuff happening in an area around the character}
+    \paragraph*{Sweep} Make an attack against a primary target. Divide up to your \stat{STR} of the successes as damage rolls between targets adjacent to the primary target, as if you were attacking those targets.
 \end{multicols}
 
 \subsection*{Knight}
@@ -99,15 +101,19 @@ The noble knight is trained in the art of swinging their sword with great effici
 \subsubsection*{Abilities}
 
 \begin{multicols}{2}
-    \paragraph*{Disarm} \tochange{Remove enemy's weapon}
+    \paragraph*{Disarm} Roll a test with \stat{DT} $6-\stat{dex}$. The opponent must win with \stat{DT} $6-\stat{str}$, or their weapon is removed and placed in a random spot, the difference between margins meters away from the attacker.
+
+    If the defender is using a weapon that cannot reasonably be removed, such as claws or their fists, they are immune to being disarmed.
 
-    \paragraph*{Trip -- \textit{reaction}} \tochange{Knock passing enemy to the floor}
+    \paragraph*{Trip -- \textit{reaction}} If a target moves within range of your weapon, roll a test against \stat{DT}~$6-\stat{dex}$. The target must win an opposed test with \stat{DT}~$6-\stat{dex}$ or be knocked \textbf{\sffamily prone}.
 
-    \paragraph*{Hard Strike} \tochange{Extra damage}
+    \paragraph*{Hard Strike} Choose a number up to \stat{STR} and roll for an attack. On success, add the chosen number to the margin. Remove at least twice as many dice from the pool (this includes the failure dice that would be removed anyway.)
 
-    \paragraph*{Parry -- \textit{reaction}} \tochange{Remove some number of attacker's attack dice or successes}
+    \paragraph*{Parry -- \textit{reaction}} On being attacked with a weapon that is not thrown or ranged, you may select a number of dice from your dice pool, up to $2 \cdot \stat{DEX}$. Roll a test with them and remove the number of successes you get from your attacker's successes. Remove the selected dice from your dice pool.
 
-    \paragraph*{Press Advantage} \tochange{Push opponent backwards}
+    \paragraph*{Press Advantage} Roll a test with \stat{DT}~$6-\stat{str}$. The opponent must win with \stat{DT} $6-\stat{str}$ or both characters move up to a difference in margins meters in a straight line going through both characters in a direction away from the attacker.
+
+    \paragraph*{Flurry} You may split your dice pool into a number of smaller pools equal to 1 + weapon proficiency, and use each one to attack a different target. After all attacks are resolved, remove failure dice from all pools and join the remaining dice back into one pool.
 \end{multicols}
 
 \subsection*{Brawler}
@@ -115,23 +121,29 @@ The noble knight is trained in the art of swinging their sword with great effici
 When, at the end of the evening, the landlord wishes to empty his tavern of the increasingly unfriendly drunks, he employs a brawler. Using raw power and whatever weapon is at hand, the brawler can empty a room in short order.
 
 \begin{tabular}[h!]{rl}
-    \textsf{\textbf{Stats}}                & \stat{STR} +1, \stat{DEX} +1, \stat{CON} +1 \\
-    \textsf{\textbf{Standard weapons}}     & Brass Knuckles, Knife, Mace                 \\
-    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Blunt Weapons               \\
-    \textsf{\textbf{Armor proficiencies}}  & Light Armor, Medium Armor                   \\
+    \textsf{\textbf{Stats}}                & \stat{STR} +1, \stat{DEX} +1, \stat{CON} +1   \\
+    \textsf{\textbf{Standard weapons}}     & Brass Knuckles, Knife, Mace                   \\
+    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Blunt Weapons, Thrown Weapons \\
+    \textsf{\textbf{Armor proficiencies}}  & Light Armor, Medium Armor                     \\
     \textsf{\textbf{Skills}}               & Athletics, Intimidation
 \end{tabular}
 
 \subsubsection*{Abilities}
 
 \begin{multicols}{2}
-    \paragraph*{Juggernaut} \tochange{Move to another spot; damage resist while moving}
+    \paragraph*{Juggernaut} Roll a \stat{DT}~$6-\stat{stb}$ test. On success, move the margin of success meters in a straight line. Note: you may not move less than the margin, unless you hit an obstacle.
+
+    While moving, the character is immune to Trip and has +1 \stat{AC} to any attacks.
 
-    \paragraph*{Toss} \tochange{Move enemy to another spot}
+    Any characters you move through must succeed a \stat{DC}~$6-\stat{stb}$ test by a margin larger than the distance already traveled, or be knocked \textbf{\sffamily prone}.
 
-    \paragraph*{Leer} \tochange{Intimidate into paralysis}
+    \paragraph*{Toss} Roll a test with \stat{DT}~$6-\stat{str}$ opposed by a \stat{DT}~$6-\stat{str}$ or $6-\stat{dex}$ test from the target. On a win, the target is moved up to the difference in margins, reduced by the target's \stat{STB}, meters away from the attacker.
 
-    \paragraph*{Knock out} \tochange{Knocks out}
+    \paragraph*{Leer} Roll a test with \stat{DT}~$6-\stat{cha}$ and note the margin of success. The target is \textbf{\sffamily paralyzed} until the accumulate as many successes as your original margin. They may roll one test with \stat{DT}~$6-\stat{wis}$ immediately, then one test per turn after that, accumulating the positive margins of success.
+
+    \paragraph*{Hard Strike} Choose a number up to \stat{STR} and roll for an attack. On success, add the chosen number to the margin. Remove at least twice as many dice from the pool (this includes the failure dice that would be removed anyway.)
+
+    \paragraph*{Knock out} Roll an opposed test with \stat{DT} $6-\stat{str}$. The opponent must win with \stat{DT} $6-\stat{stb}$, or become \textbf{\sffamily unconscious} for a number of turns equal to the difference in margins.
 \end{multicols}
 
 \section*{Rogue}
@@ -139,6 +151,7 @@ When, at the end of the evening, the landlord wishes to empty his tavern of the
 If fighters use power to gain the upper hand, rogues rely on finesse to dispatch their opponent, or, if the situation suggests it, run away.
 
 \subsubsection*{Abilities}
+\nopagebreak
 \begin{multicols}{2}
     \paragraph*{Volt} \tochange{Make a normal attack, but step back without triggering reactions.}
 \end{multicols}
@@ -148,10 +161,10 @@ If fighters use power to gain the upper hand, rogues rely on finesse to dispatch
 The stealthy thief would rather avoid a fight, if possible. However, when cornered, they can fight like a cat.
 
 \begin{tabular}[h!]{rl}
-    \textsf{\textbf{Stats}}                & \stat{Dex} +1, \stat{int} +1, \stat{cmp} +1 \\
-    \textsf{\textbf{Standard weapons}}     & Dagger, Cosh, Throwing Knife                \\
-    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Ranged Weapons              \\
-    \textsf{\textbf{Armor proficiencies}}  &                                             \\
+    \textsf{\textbf{Stats}}                & \stat{Dex} +1, \stat{int} +1, \stat{cmp} +1    \\
+    \textsf{\textbf{Standard weapons}}     & Dagger, Cosh, Throwing Knife                   \\
+    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Ranged Weapons, Thrown Weapons \\
+    \textsf{\textbf{Armor proficiencies}}  &                                                \\
     \textsf{\textbf{Skills}}               & Athletics, Stealth, Mechanism Operation
 \end{tabular}
 
@@ -173,20 +186,24 @@ Debonair and nimble, the swashbuckler is a master of flair, their flashing sword
 \begin{tabular}[h!]{rl}
     \textsf{\textbf{Stats}}                & \stat{Str} +1, \stat{dex} +1, \stat{cha} +1   \\
     \textsf{\textbf{Standard weapons}}     & Rapier, Throwing Knife, Crossbow              \\
-    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Bladed Weapon, Ranged Weapons \\
+    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Bladed Weapon, Thrown Weapons \\
     \textsf{\textbf{Armor proficiencies}}  & Light Armor                                   \\
     \textsf{\textbf{Skills}}               & Athletics
 \end{tabular}
 
 \subsubsection*{Abilities}
 \begin{multicols}{2}
+    \paragraph*{Disarm} Roll a test with \stat{DT}~$6-\stat{dex}$. The opponent must win with \stat{DT} $6-\stat{str}$, or their weapon is removed and placed in a random spot, the difference between margins meters away from the attacker.
+
+    If the defender is using a weapon that cannot reasonably be removed, such as claws or their fists, they are immune to being disarmed.
+
     \paragraph*{Flunge} \tochange{Close gap to attack}
 
-    \paragraph*{Parry -- \textit{reaction}} \tochange{Remove some number of attacker's attack dice or successes}
+    \paragraph*{Parry -- \textit{reaction}} On being attacked with a weapon that is not thrown or ranged, you may select a number of dice from your dice pool, up to $2 \cdot \stat{DEX}$. Roll a test with them and remove the number of successes you get from your attacker's successes. Remove the selected dice from your dice pool.
 
     \paragraph*{Leap} \tochange{Move without any restrictions}
 
-    \paragraph*{Flurry} \tochange{Multi-attack}
+    \paragraph*{Flurry} You may split your dice pool into a number of smaller pools equal to 1 + weapon proficiency, and use each one to attack a different target. After all attacks are resolved, remove failure dice from all pools and join the remaining dice back into one pool.
 \end{multicols}
 
 \section*{Ranger}
@@ -204,8 +221,8 @@ The survivalist strives to be one with nature; living off the land, foraging, an
 
 \begin{tabular}[h!]{rl}
     \textsf{\textbf{Stats}}                & \stat{dex} +1, \stat{con} +1, \stat{int} +1 \\
-    \textsf{\textbf{Standard weapons}}     & Knife, Machete, Bow                         \\
-    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Ranged Weapons              \\
+    \textsf{\textbf{Standard weapons}}     & Knife, Machete, Javelin                     \\
+    \textsf{\textbf{Weapon proficiencies}} & Simple Weapons, Thrown Weapons              \\
     \textsf{\textbf{Armor proficiencies}}  &                                             \\
     \textsf{\textbf{Skills}}               & Survival, Lore (nature), Track
 \end{tabular}
diff --git a/encounters.tex b/encounters.tex
index 7d3da4a..dc3c2d2 100644
--- a/encounters.tex
+++ b/encounters.tex
@@ -1,4 +1,5 @@
 \part{Encounters}
 
 \input{encounters/encounter_types}
-\input{encounters/combat}
\ No newline at end of file
+\input{encounters/combat}
+\input{encounters/conditions}
diff --git a/encounters/conditions.tex b/encounters/conditions.tex
new file mode 100644
index 0000000..2865e78
--- /dev/null
+++ b/encounters/conditions.tex
@@ -0,0 +1,20 @@
+\chapter{Conditions}
+
+\begin{multicols}{2}
+    \paragraph*{Prone}
+    The character is laid flat on the ground.
+
+    A prone character has -1 \stat{AC} against non-ranged attacks and +1 \stat{AC} against ranged attacks.
+
+    Movement while prone is limited to $1/2$ of the normal movement speed.
+
+    Character must use one action to stand up and remove the condition.
+
+    \paragraph*{Paralyzed}
+    The character is unable to act in any way, though they have full awareness of their surroundings.
+
+    \paragraph*{Unconscious}
+    The character is unable to act in any way.
+
+    Character awakens when the condition ends -- based on how it was acquired -- or when another character takes an action to awaken the unconscious character.
+\end{multicols}
diff --git a/items/equipment.tex b/items/equipment.tex
index 3978d3e..19d7c8d 100644
--- a/items/equipment.tex
+++ b/items/equipment.tex
@@ -42,7 +42,7 @@
         \textsf{\textbf{Armor}} & +5 \\
         \textsf{\textbf{Stat adjust}} & \stat{dex} -1 \\
         \textsf{\textbf{Movement adjust}} & \SI{-5}{\meter} \\
-        \textsf{\textbf{Examples}} & Full Suit of Armor
+        \textsf{\textbf{Examples}} & Full suit of armor
     \end{tabular}
 \end{multicols}
 
@@ -61,6 +61,7 @@ Weapons fall into one of five classes: simple weapons, bladed weapons, blunt wea
     \begin{tabular}[h!]{rp{4.3cm}}
         \textsf{\textbf{Proficiency stat}} & \stat{STR} \\
         \textsf{\textbf{Damage die}} & \dc{4} \\
+        \textsf{\textbf{Range}} & \SI{1}{\meter} \\
         \textsf{\textbf{Examples}} &  \raggedright Dagger, Club, Knife, Shortsword
     \end{tabular}
 
@@ -71,6 +72,7 @@ Weapons fall into one of five classes: simple weapons, bladed weapons, blunt wea
     \begin{tabular}[h!]{rp{4.3cm}}
         \textsf{\textbf{Proficiency stat}} & \stat{STR} \\
         \textsf{\textbf{Damage die}} & \dc{6} \\
+        \textsf{\textbf{Range}} & \SI{1}{\meter} \\
         \textsf{\textbf{Examples}} &  Longsword, Katana
     \end{tabular}
 
@@ -83,6 +85,7 @@ Weapons fall into one of five classes: simple weapons, bladed weapons, blunt wea
         \textsf{\textbf{Damage die}} & \dc{6} \\
         \textsf{\textbf{Damage stat}} & \stat{STR} \\
         \textsf{\textbf{Stat adjust}} & \stat{dex} -1 \\
+        \textsf{\textbf{Range}} & \SI{1}{\meter} \\
         \textsf{\textbf{Examples}} & Mace, Flail, Warhammer
     \end{tabular}
 
@@ -95,7 +98,20 @@ Weapons fall into one of five classes: simple weapons, bladed weapons, blunt wea
         \textsf{\textbf{Proficiency stat}} & \stat{dex} \\
         \textsf{\textbf{Damage die}} & \dc{4} \\
         \textsf{\textbf{Damage stat}} & \stat{dex} \\
-        \textsf{\textbf{Examples}} & Spear, Halberd, Glaive
+        \textsf{\textbf{Range}} & \SI{2}{\meter} \\
+        \textsf{\textbf{Examples}} & Spear, Halberd, Glaive, Quarterstaff
+    \end{tabular}
+
+    \subsection*{Thrown Weapons}
+
+    Thrown weapons can be used at short ranges to do damage at a distance.
+
+    \begin{tabular}[h!]{rp{4.3cm}}
+        \textsf{\textbf{Proficiency stat}} & \stat{dex} \\
+        \textsf{\textbf{Damage die}} & \dc{4} \\
+        \textsf{\textbf{Damage stat}} & \stat{STR} \\
+        \textsf{\textbf{Range}} & \SI{20}{\meter} \\
+        \textsf{\textbf{Examples}} & Throwing knife, Javelin
     \end{tabular}
 
     \subsection*{Ranged Weapons}
@@ -105,7 +121,8 @@ Weapons fall into one of five classes: simple weapons, bladed weapons, blunt wea
     \begin{tabular}[h!]{rp{4.3cm}}
         \textsf{\textbf{Proficiency stat}} & \stat{dex} \\
         \textsf{\textbf{Damage die}} & \dc{4} \\
-        \textsf{\textbf{Examples}} & Throwing knife, Javelin, Bow, Sling
+        \textsf{\textbf{Range}} & \SI{100}{\meter} \\
+        \textsf{\textbf{Examples}} & Bow, Crossbow, Sling
     \end{tabular}
 
 \end{multicols}
\ No newline at end of file
diff --git a/kartsstyle b/kartsstyle
index 642fec7..e67a685 160000
--- a/kartsstyle
+++ b/kartsstyle
@@ -1 +1 @@
-Subproject commit 642fec7b08a369ee488682a05fe1232720574f97
+Subproject commit e67a68540a8fe578f2da7c04baba41a18c064ea4