diff --git a/markets/riverside.tex b/markets/riverside.tex
index f11f35fb7768b581ed05d8b81d7625745d00c3fc..fc189fb5df38e8896f05bbc9b4cc0a5e73ce3f2a 100644
--- a/markets/riverside.tex
+++ b/markets/riverside.tex
@@ -126,21 +126,16 @@ Local guide & \mkPrice{2} \\
 \end{boxtable}
 
 \ifnum\value{r4b}>2
-  \glssymbol{wrecan}
-  \textbf{At the Smith's}
-
-  \begin{boxtable}[XXXXc]
+  \begin{nametable}[XXXXc]{\glsentrysymbol{wrecan}~At the Smith's}
     \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
     \ifnum\value{r3}>11
       \showArmourPrice{\completechain}{28}%
     \fi
     \showArmourPrice{\partialchain}{18}%
-  \end{boxtable}
+  \end{nametable}
 \else
   \ifnum\value{r12}>9
-    \glssymbol{sylf}
-    \textbf{At the Fletcher's}
-    \begin{boxtable}[XYYYXl]
+    \begin{nametable}[XYYYXl]{\glsentrysymbol{sylf}~At the Fletcher's}
 
       \textbf{Projectile} & Attack Bonus & \textbf{Damage} & \textbf{\Gls{ap}} & \textbf{Weight} & \textbf{Cost} \\\hline
 
@@ -150,7 +145,7 @@ Local guide & \mkPrice{2} \\
 
       Longbow &  +2  & +2 & 2~\glspl{ap} & 1  & \mkPrice{12}  \\
 
-    \end{boxtable}
+    \end{nametable}
   \else
       \begin{boxtable}[XYYYXl]
 
@@ -170,21 +165,19 @@ Local guide & \mkPrice{2} \\
 \fi
 
 \ifnum\value{r4b}>2
-\needspace{6em}
-\textbf{At the Tanner's}
-  \begin{boxtable}[XXXXX]
+  \begin{nametable}[XXXXX]{At the Tanner's}
     \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
     \showArmourPrice{\partialleather}{5}%
     \showArmourPrice{\completeleather}{11}%
     \showArmourPrice{\partiallisk}{31}%
-  \end{boxtable}
+  \end{nametable}
 
-  \begin{boxtable}[XXX]
+  \begin{nametable}[XXX]
     \rareMarketItem{Hardened half-yurt (dr 4)}{3}{12}
     \rareMarketItem{Tent for 4}{4}{8}
     \rareMarketItem{Tent for 3}{3}{6}
     \rareMarketItem{Tent for 2}{2}{4}
     \marketItem{Tent for 1}{1}{3}
-  \end{boxtable}
+  \end{nametable}
 \fi
 
diff --git a/markets/roadside.tex b/markets/roadside.tex
index 15046cd645d67a48e827d02d0a44df0414609971..f318a360043654614f1eb36190933ada398adb28 100644
--- a/markets/roadside.tex
+++ b/markets/roadside.tex
@@ -40,9 +40,7 @@ Farmers chat, then barter, and finally refer the buyer to a neighbour.
 \ifnum\value{r12}>8
 \noindent
 \begin{minipage}{\linewidth}
-\glssymbol{nulla}
-\textbf{At the Doula's}
-  \begin{boxtable}[Xcc]
+  \begin{nametable}[Xcc]{\glsentrysymbol{nulla}~At the Doula's}
     \textbf{Things on shelves} & \textbf{Weight} & \textbf{Cost} \\\hline
     \rareMarketItem[9]{Air \Glsentrytext{ingredient}}{1}{23}%
     \rareMarketItem[9]{Fire \Glsentrytext{ingredient}}{1}{23}%
@@ -55,7 +53,7 @@ Farmers chat, then barter, and finally refer the buyer to a neighbour.
     \rareMarketItem[9]{Water \Glsentrytext{boon}}{1}{24}%
     \rareMarketItem[9]{Fate \Glsentrytext{boon}}{1}{24}%
     \marketItem{Cup of tea}{0}{0}%
-  \end{boxtable}
+  \end{nametable}
 \end{minipage}
 \fi
 
@@ -126,16 +124,13 @@ Local guide & \mkPrice[cp]{50} per mile \\
 \end{boxtable}
 
 \ifnum\value{r4b}>2
-  \glssymbol{wrecan}
-  \textbf{At the Smith's}
-
-  \begin{boxtable}[XXXXc]
+  \begin{nametable}[XXXXc]{\glsentrysymbol{wrecan}~At the Smith's}
     \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
     \ifnum\value{r3}>11
       \showArmourPrice{\completechain}{28}%
     \fi
     \showArmourPrice{\partialchain}{18}%
-  \end{boxtable}
+  \end{nametable}
 \else
   \ifnum\value{r12}>9
     \glssymbol{sylf}
@@ -170,14 +165,12 @@ Local guide & \mkPrice[cp]{50} per mile \\
 \fi
 
 \ifnum\value{r4b}>2
-\needspace{6em}
-\textbf{At the Tanner's}
-  \begin{boxtable}[XXXXX]
+  \begin{nametable}[XXXXX]{At the Tanner's}
     \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
     \showArmourPrice{\partialleather}{5}%
     \showArmourPrice{\completeleather}{11}%
     \showArmourPrice{\partiallisk}{31}%
-  \end{boxtable}
+  \end{nametable}
 
   \begin{boxtable}[XXX]
     \rareMarketItem{Hardened half-yurt (dr 4)}{3}{12}
diff --git a/markets/town.tex b/markets/town.tex
index 41e40943c1bad0cb0e4515f3f0265e7e2fd05287..ae1155e1e58f84e2d4cfa35a9aae2a45f09dc238 100644
--- a/markets/town.tex
+++ b/markets/town.tex
@@ -161,21 +161,17 @@
 
 \end{boxtable}
 
-\textbf{At the Tanner's}
-
-\begin{boxtable}[XXXXX]
+\begin{nametable}[XXXXX]{At the Tanner's}
   \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
   \showArmourPrice{\partialleather}{5}%
   \showArmourPrice{\completeleather}{11}%
   \showArmourPrice{\partiallisk}{40}%
   \showArmourPrice{\completelisk}{50}%
-\end{boxtable}
+\end{nametable}
 
-\needspace{4em}
-\textbf{At the place with that guy I met at \glsentrytext{pig}\ldots}
-\begin{boxtable}[Xcc]
+\begin{nametable}[Xcc]{At the place with that guy I met that night\ldots}
   \textbf{Items} & \textbf{Weight} & \textbf{Cost} \\\hline
   \marketItem{Lock-pick set}{1}{10}
   \marketItem{Fake town-pass}{0}{3}
-\end{boxtable}
+\end{nametable}
 
diff --git a/start.tex b/start.tex
index 255eac46bd0031af8b23a63dfca5bd2edd28c79a..9695dedba43d889b4b43ff64188e97be80b50b2b 100644
--- a/start.tex
+++ b/start.tex
@@ -17,8 +17,8 @@
   \item
   {\tt goto \ref{newPC}}
   \item
-  \Glspl{xp}, tea%
-  \ifodd\value{r3}\footnote{I recommend Russian Black leaf.}\fi
+  \Glspl{xp}, tea %
+  \ifodd\value{r3}\else\footnote{I recommend Russian Black leaf.}\fi
   \& cakes all round.
 \end{enumerate}