diff --git a/layout.sty b/layout.sty
index d60f23e436c015d64e55dc289e32fa79c72b770e..c3a313491095d0ea64cfd4c92f339d12150e8464 100644
--- a/layout.sty
+++ b/layout.sty
@@ -723,6 +723,17 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 
 \raggedbottom
 
+ \newif\ifafterpar
+ \newcommand\afterparnoindent{%
+   \afterpartrue
+   \everypar{%
+     \ifafterpar
+       \afterparfalse
+       {\setbox\z@\lastbox}%
+     \else
+       \everypar{}%
+     \fi}}
+
 % Make floats hug the text.
 \setlength\intextsep{0em}
 
@@ -774,9 +785,10 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 
 \newcommand{\spell}[4]{
   \index[spells]{#1: #4}
-  \subsubsection{#1}
+  \subsubsection[#1: #4]{#1}
 
   {\it Type: #2, Skill: #3}
+  \afterparnoindent
 }
 
 % Toggles for knacks
@@ -880,6 +892,7 @@ Roll & Result \\
   bottom=10pt,
   left=3pt,
   right=3pt,
+  after={\afterparnoindent},
   code={\rowcolors{2}{}{gray!10}\needspace{2em}}
   }
 
@@ -897,7 +910,9 @@ Roll & Result \\
 
 \newcommand{\story}[2]{%
   \subsubsection{#2}
-  Cost: #1\par\noindent
+  \textbf{Cost:} #1
+  \\
+  \afterparnoindent
 }
 
 \newcommand{\best}[2][\E]{
diff --git a/stats.sty b/stats.sty
index 1b65c1b24e1d658501d9e69c0377b4055b57d6cd..23e425e5127c0a6d5c5b4d394d38e5e81f638222 100644
--- a/stats.sty
+++ b/stats.sty
@@ -266,7 +266,7 @@
 	{}
   \settoggle{examplecharacter}{false}
   \settoggle{creatureBox}{false}
-
+  \afterparnoindent
 }
 
 \newcommand{\animal}[9]{
@@ -310,7 +310,7 @@
 
 	\end{tcolorbox}
   \settoggle{creatureBox}{false}
-
+  \afterparnoindent
 }
 
 \newcommand{\clean}{