diff --git a/docs.tex b/docs.tex
index 0487d50fa9ffed217cdb2575a577fa46859b043b..1a2f0d894bf7b446d8a1f513d049b0b4bed5b8c9 100644
--- a/docs.tex
+++ b/docs.tex
@@ -373,105 +373,6 @@ Available commands:
 
 Make encounter tables like this:
 
-\begin{verbatim}
-
-\begin{figure*}[t]
-\begin{nametable}[c|LLLLLLLL,fontupper=\small,]{Enc}
-Rolls & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 \\
-\hline
-8 & Villagers & Sulphur Winds & Lightning Storm & Earthquake & Hurricane &
-  Mouthdigger 1 & Woodspy 1 & Forest Fire \\
-7 & Flood & Heatwave & High Humidity & Woodspy 2 & Chitincrawler 1 &
-  Chitincrawler 2 & Bear 1 & Basilisk 1 \\
-6   Guards 1 & Rain & Guard 2 & Rain & Elves 1 & Woodspy 4 &
-  Woodspy 2 & Chitincrawler 3 \\
-5 & Noble & Traders 1 & Bandits 1 & Wolves 1 & Lightning Storm &
-  Gnolls 1 & Deer & Mana Lake \\
-4 & Villagers & Traders 2 & Wind & Bear 2 & Wolves 2 &
-  Mouthdigger 2 & Basilisk 2 & Griffins 1 \\
-3 & Trader 3 & Guards 3 & Traders 4 & Refugees & Gnomes 1 &
-  Gnolls 2 & Brigands & Elves 2 \\
-2 & Traders 5 & Pilgrims & Breeze & Bandits 2 & Mouthdigger 3 &
-  Griffins 2 & boar & Wild Horses \\
-1 & Bard & Dwarves 1 & Dwarves 2 & Griffin 3 & Bandits 3 &
-  Gnomes 2 & Griffins 4 & Aurochs \\
-0 & Begging Villagers & Bandits 4 & Snowfall & Hail & Wolves 3 &
-  Snowstorm & Wolves 4 & Hibernating Chitincrawler 4 \\
-\end{nametable}
-\end{figure*}
-
-\end{verbatim}
-
-(Check below for the results)
-
-\begin{multicols}{2}
-
-\begin{figure*}[t]
-\begin{nametable}[c||L|L|LLLL|L|L,fontupper=\footnotesize,]{Enc}
-
-  & \textbf{Villages} & \textbf{Villages, Edge} & \textbf{Villages, Edge, Forest} & \textbf{Villages, Edge, Forest}  & \textbf{Villages, Edge, Forest} & \textbf{Villages, Edge, Forest} & \textbf{Edge, Forest} & \textbf{Forest} \\
-\hline
-\textbf{Rolls} & \textbf{1} & \textbf{2} & \textbf{3} & \textbf{4} & \textbf{5} & \textbf{6} & \textbf{7} & \textbf{8} \\
-\hline
-\hline
-\textbf{8} & Villagers & Sulphur Winds & Lightning Storm & Earthquake & Hurricane & Mouthdigger 1 & Woodspy 1 & Forest Fire \\
-\hline
-\textbf{7} & Flood & Heatwave & High Humidity & Woodspy 2 & Chitincrawler 1 & Chitincrawler 2 & Bear 1 & Basilisk 1 \\
-\hline
-\textbf{6} & Guards 1 & Rain & Guard 2 & Rain & Elves 1 & Woodspy 4 & Woodspy 2 & Chitincrawler 3 \\
-\hline
-\textbf{5} & Noble & Traders 1 & Bandits 1 & Wolves 1 & Lightning Storm & Gnolls 1 & Deer & Mana Lake \\
-\textbf{4} & Villagers & Traders 2 & Wind & Bear 2 & Wolves 2 & Mouthdigger 2 & Basilisk 2 & Griffins 1 \\
-\textbf{3} & Trader 3 & Traders 4 & Guards 3 & Refugees & Gnomes 1 & Gnolls 2 & Brigands & Elves 2 \\
-\hline
-\textbf{2} & Traders 5 & Pilgrims & Breeze & Bandits 2 & Mouthdigger 3 & Griffins 2 & Boar & Wild Horses \\
-\hline
-\textbf{1} & Bard & Dwarves 1 & Dwarves 2 & Griffin 3 & Bandits 3 & Gnomes 2 & Griffins 4 & Aurochs \\
-\hline
-\textbf{0} & Begging Villagers & Bandits 4 & Snowfall & Hail & Wolves 3 & Snowstorm & Wolves 4 & Hibernating Chitincrawler 4 \\
-\end{nametable}
-\end{figure*}
-
-And charts about roll successes like this:
-
-\begin{verbatim}
-
-
-  \begin{rollchart}
-
-    Roll & Result \\\hline
-
-    12 & Success \\
-
-    11 & Failure \\
-
-  \end{rollchart}
-
-\end{verbatim}
-
-\begin{rollchart}
-
-  Roll & Result \\\hline
-
-  12 & Success \\
-
-  11 & Failure \\
-
-\end{rollchart}
-
-\subsection{Making Maps}
-
-Make all maps under some subsection, then start the individual map entry like this: \verb"\mapentry[docGift]{Documentation Giftschrank}".
-
-The first (optional) argument, will become the label.
-The second is the area's title.
-
-\mapentry[docGift]{Documentation Giftschrank}
-
-You can refer to it with \verb"\nameref{docGift}", such as ``see room number \ref{docGift}''.
-
-\end{multicols}
-
 \section{Others}
 
 \begin{multicols}{2}
diff --git a/layout.sty b/layout.sty
index 8e9fff221cade8ded18d2a4e8d00417ca9e9627d..c25814b472114a6684b8714eb106b28beeb0d046 100644
--- a/layout.sty
+++ b/layout.sty
@@ -910,20 +910,6 @@ Roll & Result \\
   \end{figure*}
 }
 
-% this shows encounters, and the two counters below show the encounter number
-
-\newtcolorbox[use counter=enc, use counter=list]{encounters}[1]{
-  ornamented,
-  adjusted title=Encounters in #1,
-  tabularx={XXp{.6\textwidth}},
-  bottom=10pt,
-  left=3pt,
-  right=3pt,
-  code={\index{Encounter Tables}\rowcolors{2}{}{gray!10}\setcounter{enc}{19}\setcounter{list}{18}}}
-
-\newcommand{\li}{\addtocounter{enc}{-1}\arabic{enc}&}
-\newcommand{\lii}{\addtocounter{list}{-1}\arabic{list}&}
-
 \newtcolorbox{boxtable}[1][cX]{
   tabularx={#1},
   ornamented,
@@ -1026,7 +1012,7 @@ Roll & Result \\
   \resumecontents[#1]
   \subsubsection[%
     \arabic{sqNo} -- %
-    \iftoggle{firstsq}{\CheckedBoxsqr}{\sqn}%
+    \iftoggle{firstsq}{\sqr}{\sqn}%
     #2 -- #3]%
     {(#1) #2}
   \stopcontents[#1]\settoggle{firstsq}{false}
diff --git a/test.tex b/test.tex
index 13e71d92657dc82d2bd895e312ee13d02a428dc6..8e80b945d9416827b08f6fa455c0ef167f9da2a9 100644
--- a/test.tex
+++ b/test.tex
@@ -50,22 +50,6 @@ Current day should equal \arabic{r4b}.
 
 \subsection{And now for something completely different}
 
-
-\subsection{Encounters}
-
-\begin{encounters}{Wonderland}
-
-  Fields & Gardens & Results \\\hline
-
-  \li & Doormouse \\
-  \li & Dodo \\
-  \li \lii Unicorn \\
-  \li \lii Red Queen \\
-  & \lii Black Queen \\
-  & \lii Green Queen \\
-
-\end{encounters}
-
 \begin{rollchart}
 
 Roll & Result \\\hline