diff --git a/Chapter_Makefile b/Chapter_Makefile
index d9c5d98..ab98de6 100644
--- a/Chapter_Makefile
+++ b/Chapter_Makefile
@@ -26,8 +26,11 @@ all: clean chapter.pdf
 
 .PHONY: preview
 preview:
+	rm chapter.aux # make sure biblatex defernumbers works properly
+	pdflatex -shell-escape -jobname chapter '\def\thesispreviewmode{}\input{chapter-template.tex}'
 	biber --input-directory=.. chapter || true
 	pdflatex -shell-escape -jobname chapter '\def\thesispreviewmode{}\input{chapter-template.tex}'
+	pdflatex -shell-escape -jobname chapter '\def\thesispreviewmode{}\input{chapter-template.tex}'
 
 version.tex: chapter.tex
 	echo "${VERSION_STRING}" > $@
@@ -39,6 +42,6 @@ update-figures:
 .PHONY: clean
 clean:
 	rm -f **.aux **.bbl **.bcf **.log **.blg
-	rm -f **.mtc **.mtc*
+	rm -f **.mtc **.mtc* *.maf *.toc
 	rm -f **.out **.run.xml **/texput.log 
 
diff --git a/chapter-hsms/chapter.tex b/chapter-hsms/chapter.tex
index 1957044..3183d0f 100644
--- a/chapter-hsms/chapter.tex
+++ b/chapter-hsms/chapter.tex
@@ -121,13 +121,13 @@ mesh implementations as a means to prevent copying of their designs~\cite{
     heitmannTamperBarrierElectronic2005,
     clarkTamperDetectionSystem2005,
     heitmannMethodMakingTamper2009,
-    perreaultSystemMethodInstalling2005
+    perreaultSystemMethodInstalling2005,
 }. The basic principle of modern tamper-sensing meshes of preventing intrusion by force through embedding a looped
 conductor to cover a surface traces back as far as at least 1870~\cite{
     ImprovementProtectingSafes1870,
     ImprovementElectromagneticEnvelopes1870}, when it was applied to the protection of bank vaults from robbers
 attempting to dig, drill and saw through the vault's floor and walls. Even multi-layer, orthogonal tamper-sensing meshes
-are documented as far back as 1902~\ref{suttonElectricallyprotectedStructure1902}. Using printed circuits instead of
+are documented as far back as 1902~\cite{suttonElectricallyprotectedStructure1902}. Using printed circuits instead of
 wires for this purpose occurs in literature as soon as printed circuit technology finds widespread commercial adoption
 in the 1960ies~\cite{hamPrintedcircuitTypeSecurity1971}. The history of more HSM-like devices begins in the 1990ies with
 the widespread adoption of cryptography in commercial applications~\cite{
@@ -140,7 +140,7 @@ the widespread adoption of cryptography in commercial applications~\cite{
     cookTamperDetectionCircuit2020,
     brodskyCircuitLayoutsTamperrespondent2018,
     cobianuLargeAreaDistributed2008,
-    phamAntitamperMesh2011
+    phamAntitamperMesh2011,
 } when instead of protecting an entire device it became feasible to create a protected cryptographic coprocessor.
 
 \subsection{Tamper-sensing Mesh Manufacturing}
@@ -192,7 +192,7 @@ reference resistor, or using a wheatstone bridge. Using a bridge circuit was alr
 implementations~\cite{
     ElektrischeSicherheitseinrichtungSchutze1932,
     hamPrintedcircuitTypeSecurity1971,
-    dalphinEnceinteProtegeeAvec1987
+    dalphinEnceinteProtegeeAvec1987,
 } and makes it possible to detect small changes in the mesh's resistance with little complexity.
 
 % TODO US7345497B2 uses balanced transmission lines / fast pulses
@@ -421,7 +421,7 @@ structure size, which limits the possible angles an attack tool could be inserte
 \end{figure}
 
 Regular Printed Circuit Boards are frequently used to implement tamper-sensing meshes as shown in
-Figure~\ref{hsm_fic_materials_pcb_rigid}. PCB production is a highly advanced, large-scale industry and PCBs are
+Figure~\ref{hsm_fig_materials_pcb_rigid}. PCB production is a highly advanced, large-scale industry and PCBs are
 inexpensive, commodity products. PCBs can be manufactured with many layers, at almost arbitrary total thickness, and
 offer small structure sizes enabling the creation of fine features down to approximately \qty{100}{\micro\meter} even on
 commodity processes. The primary disadvantage of using PCBs to implement tamper-sensing meshes is that PCBs are
@@ -531,7 +531,7 @@ Figure~\ref{hsm_fig_connector_stack}, a land pattern for an elastomeric connecto
 Elastomeric connectors are elegant and allow for multiple contacts to be made in a small area using a single elastomeric
 connector strip, but they are not off-the-shelf components and are always custom made to order. We found several
 instances where other, off-the-shelf technologies were used instead to create a pressure-sensitive connection.
-Figure~\ref{fig_hsm_connector_gasket} shows a connection made using conductive gaskets intended for creating gapless
+Figure~\ref{hsm_fig_connector_gasket} shows a connection made using conductive gaskets intended for creating gapless
 connections between PCBs and enclosures to shield Electromagnetic Emissions (EMI). Unlike elastomeric connectors, they
 are not anisotropic and thus they must be cut into pieces to maintain isolation between adjacent pads. This results in a
 much larger contact pitch compared to other solutions.
diff --git a/chapter-template.tex b/chapter-template.tex
index 2e76808..8c01189 100644
--- a/chapter-template.tex
+++ b/chapter-template.tex
@@ -22,6 +22,8 @@
 
 \begin{document}
 
+\setlength{\headheight}{13.6pt}
+
 \faketableofcontents
 
 \input{chapter}
diff --git a/common-defs.tex b/common-defs.tex
index df08ede..32d5684 100644
--- a/common-defs.tex
+++ b/common-defs.tex
@@ -36,9 +36,9 @@
 \renewcommand{\thesubsubsection}{\arabic{section}.\arabic{subsection}.\arabic{subsubsection}}
 
 % Re-define heading formats to force single line spacing
-\titleformat{\section}{\normalfont\large\bfseries\singlespacing}{\thesection}{1em}{}
-\titleformat{\subsection}{\normalfont\large\bfseries\singlespacing}{\thesubsection}{1em}{}
-\titleformat{\subsubsection}{\normalfont\large\bfseries\singlespacing}{\thesubsubsection}{1em}{}
+%\titleformat{\section}{\normalfont\large\bfseries\singlespacing}{\thesection}{1em}{}
+%\titleformat{\subsection}{\normalfont\large\bfseries\singlespacing}{\thesubsection}{1em}{}
+%\titleformat{\subsubsection}{\normalfont\large\bfseries\singlespacing}{\thesubsubsection}{1em}{}
 
 \dominitoc
 
@@ -128,8 +128,6 @@
 \newcommand{\draftgraphics}{\ifdefined\thesispreviewmode\textcolor{red}{\bfseries Not final graphics. }\fi}
 \newcommand{\camerareadygraphics}{\ifdefined\thesispreviewmode Camera-ready graphics. \fi}
 \newcommand{\scaledgraphics}[1]{\ifdefined\thesispreviewmode scaled-#1\else#1\fi}
-
-\newcolumntype{P}[1]{>{\centering\arraybackslash}p{#1}}
 \newcommand{\partno}[1]{\textsf{\small#1}}
 \newcommand{\price}[2]{#1 #2}
 
@@ -140,11 +138,11 @@
 \newcommand{\chapterbibliography}{
     \clearpage % clearpage flushes all figures. force this here so we don't get figures floating in between references.
     \newrefcontext[labelprefix={W}]
-    \printbibliography[type={online},title={Web sources},heading=subbibintoc]
+    \printbibliography[type={online},title={Web sources},resetnumbers,heading=subbibintoc]
     \newrefcontext
     \printbibliography[nottype={online},nottype={patent},resetnumbers,heading=subbibintoc]
     \newrefcontext[labelprefix={P}]
-    \printbibliography[type={patent},title={Patent References},heading=subbibintoc]
+    \printbibliography[type={patent},title={Patent References},resetnumbers,heading=subbibintoc]
 }
 
 \hyphenation{a-me-na-ble}
diff --git a/common-packages.tex b/common-packages.tex
index 119d551..a62b036 100644
--- a/common-packages.tex
+++ b/common-packages.tex
@@ -15,10 +15,10 @@
 \usepackage{tikz}
 \usepackage{mathtools}
 \usepackage{setspace}
-\usepackage{titlesec}
+%\usepackage{titlesec} allegedly incompatible with minitoc 
 \usepackage{fancybox}
 \usepackage{fancyhdr}
-\usepackage[binary-units,per-mode=fraction]{siunitx}
+\usepackage[per-mode=fraction]{siunitx}
 \usepackage[hidelinks]{hyperref}
 \usepackage{commath}
 \usepackage{graphicx,color}
@@ -39,3 +39,4 @@
 \usepackage{minted} % pygmentized source code
 %\usepackage[pdftex]{graphicx,color}
 %\usepackage{showframe} % Useful for page layout debugging
+\usepackage{csquotes}