diff --git a/arms.sty b/arms.sty
index 7d9024b65925cd4607d804d0ac66af7f32e980cd..f474cd256e0fd41c26d72ca1763a519f818a3ce1 100644
--- a/arms.sty
+++ b/arms.sty
@@ -15,6 +15,7 @@
 
 \newcounter{weaponBonus}
 \newcounter{weaponDamage}
+\newcounter{weaponWeight}
 \newcounter{covering}
 \newcounter{armourDR}
 \newcounter{armourWeight}
@@ -26,12 +27,12 @@
   \setcounter{weaponBonus}{#3}%
   \setcounter{weaponDamage}{#4}%
   \setcounter{heft}{#4}%
-  \setcounter{armourWeight}{#4}%
+  \setcounter{weaponWeight}{#4}%
   \ifnum#3>-1% If the weapon's attack bonus is positive,
     \addtocounter{heft}{#3}% add it to the AP cost and 
-    \addtocounter{armourWeight}{#3}% weight rating,
-    \addtocounter{armourWeight}{#3}% weight rating again,
-    \roundUp{armourWeight}% half weight rating
+    \addtocounter{weaponWeight}{#3}% weight rating,
+    \addtocounter{weaponWeight}{#3}% weight rating again,
+    \roundUp{weaponWeight}% half weight rating
     \roundUp{heft}% then the AP cost by 2.
   \fi%
   #1%
diff --git a/glossary.tex b/glossary.tex
index 75e891e342e51d90065041cc388efbc83b1e9df0..c9ab56b532aea21e6d055c264721dee5a1de25e3 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -824,6 +824,14 @@
   description={Plant, probably dangerous}
 }
 
+\newglossaryentry{encumbrance}{
+  type=symbols,
+  sort=Encumbrance,
+  nonumberlist,
+  name={\Semisextile},
+  description={Encumbrance}
+}
+
 \newglossaryentry{N}{
   type=symbols,
   sort=Nura,
diff --git a/main.tex b/main.tex
index 7748430b05b01ed3d6e8c391891af4f83af31bae..5869721abe73eb8744fe359e9a0345dd535c7e73 100644
--- a/main.tex
+++ b/main.tex
@@ -41,6 +41,7 @@
   \renewcommand\equipment{#6}
   \computeStats
   #7
+  \computeEncumbrance
 
   %%%%%%%%%%
   (\npcsymbol)\quad
@@ -64,7 +65,9 @@
       {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi}
   \fi
 
-  \showKnacks
+  \ifnum\value{knacks}>0
+    \textbf{Knacks}: \showKnacks
+  \fi
 
   \hrulefill
 
@@ -79,7 +82,8 @@
   \ifdefempty{\armourName}{}{%
     \armourName,
   }%
-  \equipment%
+  \equipment %
+  \hfill \Repeat{\value{encumbrance}}{~\glsentrytext{encumbrance}}
 
   {\scshape
     \glsentrytext{ap} \arabic{ap},
@@ -129,7 +133,7 @@
     \partialleather
   }
   {\adrenalinesurge, \mightydraw}
-  {cheese}% EQUIPMENT
+  {\rations}% EQUIPMENT
   {}% Abilities
 
 
diff --git a/stats.sty b/stats.sty
index d2fc82c33b536d0c1e3268bdc9babc880df16a9e..48a637561ff104f88f53f8e39ebff4eaddc782dd 100644
--- a/stats.sty
+++ b/stats.sty
@@ -587,9 +587,9 @@
   \knacks{}
   \foreach \s in {Air,Earth,Fate,Fire,Water,Projectiles,Combat,Brawl,Academics,Alchemy,Athletics,Caving,Crafts,Deceit,Empathy,Flight,Medicine,Performance,Larceny,Seafaring,Stealth,Tactics,Vigilance,Wyldcrafting}%
     {\setcounter{\s}{0}}
-  \setcounter{noAppearing}{1}
-  \foreach \s in {dr,weaponDamage,weaponBonus,armourDR,armourWeight,fp,sp,heft,weight,damage,knacks,mp,xpbonus}%
+  \foreach \s in {encumbrance,dr,weaponDamage,weaponBonus,weaponWeight,armourWeight,armourDR,armourWeight,fp,sp,heft,weight,damage,knacks,mp,xpbonus}%
     {\setcounter{\s}{0}}
+  \setcounter{noAppearing}{1}
 }
 
 %%       _   _        _ _           _            
@@ -688,12 +688,6 @@
   \iftoggle{allyCharacter}{}{%
     \addtocounter{att}{7}%
   }%
-  \setcounter{maxWeight}{\value{hp}}% now to compute encumbrance
-  \divide\value{maxWeight} by 2%
-  \ifnum\value{weight}>\value{maxWeight}%
-    \addtocounter{encumbrance}{\value{weight}}%
-    \addtocounter{encumbrance}{-\value{maxWeight}}%
-  \fi%
   \setcounter{ap}{\value{Speed}}%
   \addtocounter{ap}{3}%
   \addtocounter{ap}{-\value{encumbrance}}%
@@ -713,6 +707,30 @@
   }%
 }
 
+\newcommand\computeEncumbrance{%
+  \setcounter{maxWeight}{\value{hp}}% now to compute encumbrance
+  \roundUp{maxWeight}%
+  \ifnum\value{armourWeight}>\value{maxWeight}%
+    \addtocounter{encumbrance}{\value{armourWeight}}%
+    \addtocounter{encumbrance}{-\value{maxWeight}}%
+  \fi%
+  \ifnum\value{weaponWeight}>\value{maxWeight}%
+    \addtocounter{encumbrance}{\value{weaponWeight}}%
+    \addtocounter{encumbrance}{-\value{maxWeight}}%
+  \fi%
+  \ifnum\value{weight}>\value{maxWeight}%
+    \addtocounter{encumbrance}{\value{weight}}%
+    \addtocounter{encumbrance}{-\value{weight}}%
+  \fi%
+  \addtocounter{weight}{\value{weaponWeight}}%
+  \addtocounter{weight}{\value{armourWeight}}%
+  \ifnum\value{weight}>\value{hp}%
+    \addtocounter{encumbrance}{\value{weight}}%
+    \addtocounter{encumbrance}{-\value{hp}}%
+  \fi%
+  \addtocounter{ap}{-\value{encumbrance}}%
+}
+
 %%     _               _        _
 %%  __| | ___ _ __ ___| |_ __ _| |_ ___ 
 %% / _` |/ _ \ '__/ __| __/ _` | __/ __|