diff --git a/extra/latex.sh b/extra/latex.sh
new file mode 100644
index 0000000..e4842b5
--- /dev/null
+++ b/extra/latex.sh
@@ -0,0 +1,16 @@
+DIR="$(mktemp -d)"
+cp ../tests/*_in.tex $DIR
+cp ../tests/*_out.tex $DIR
+cp *.cls $DIR
+cd $DIR
+echo $DIR
+
+for file in *_in.tex; do
+    f=$(basename $file _in.tex)
+    echo $f
+    latexmk -pdf -quiet -rc-report- ${f}_in.tex >/dev/null 2>&1
+    latexmk -pdf -quiet -rc-report- ${f}_out.tex >/dev/null 2>&1
+    pdftotext ${f}_in.pdf >/dev/null 2>&1
+    pdftotext ${f}_out.pdf >/dev/null 2>&1
+    diff -u ${f}_in.txt ${f}_out.txt | diff-so-fancy
+done
diff --git a/extra/ociamthesis.cls b/extra/ociamthesis.cls
new file mode 100644
index 0000000..05a67ea
--- /dev/null
+++ b/extra/ociamthesis.cls
@@ -0,0 +1,256 @@
+% ociamthesis v2.2
+% By Keith A. Gillow <gillow@maths.ox.ac.uk>
+% Version 1.0 released 26/11/1997
+%-------------------------- identification ---------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{ociamthesis}[2010/11/22 v2.2 OCIAM thesis class]
+%-------------------------- initial code -----------------------
+\def\logoversion{squarelogo}
+\DeclareOption{beltcrest}{\def\logoversion{beltcrest}}
+\DeclareOption{shieldcrest}{\def\logoversion{shieldcrest}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
+\ProcessOptions\relax
+\LoadClass[a4paper]{report}
+% As an alternative to the above could use next line for twosided output
+%\LoadClass[a4paper,twoside,openright]{report}
+
+\RequirePackage{graphicx} % needed for latest frontpage logo
+\RequirePackage{ifthen}   % needed for option parsing for logo
+
+\raggedbottom
+
+%define the default submitted text
+\newcommand{\submittedtext}{{A thesis submitted for the degree of}}
+
+%
+% DECLARATIONS
+%
+% These macros are used to declare arguments needed for the
+% construction of the title page and other preamble.
+
+% The year and term the thesis is submitted 
+\def\degreedate#1{\gdef\@degreedate{#1}}
+% The full (unabbreviated) name of the degree
+\def\degree#1{\gdef\@degree{#1}}
+% The name of your Oxford college (e.g. Christ Church, Pembroke)
+\def\college#1{\gdef\@college{#1}}
+
+
+%
+% Setup choosen crest/logo
+%
+
+\ifthenelse{\equal{\logoversion}{shieldcrest}}%
+{
+% Traditional Oxford shield crest
+%Using latex metafont (Mathematical Institute system)
+\font\crestfont=oxcrest40 scaled\magstep3
+\def\logo{{\crestfont \char1}}
+%For comlab system replace 1st line above with
+%\font\crestfont=crest scaled\magstep3
+}{}
+
+\ifthenelse{\equal{\logoversion}{beltcrest}}%
+{
+% Newer Oxford Belt crest
+%Using latex metafont (Mathematical Institute system)
+\font\beltcrestfont=oxbeltcrest
+\def\logo{{\beltcrestfont \char0}}
+%For comlab system replace 1st line above with
+%\font\beltcrestfont=newcrest
+}{}
+
+\ifthenelse{\equal{\logoversion}{squarelogo}}%
+{
+% Latest Logo, Square version (the default!)
+% you need an oxlogo.eps or oxlogo.pdf file as appropriate
+\def\logo{{
+%\includegraphics[width=32mm,draft=false]{../graphics/branding/oxlogo}
+}}
+}{}
+
+%
+% Define text area of page and margin offsets
+%
+\setlength{\topmargin}{0.0in} %0.0in
+\setlength{\oddsidemargin}{0.167in}  % 0.33in
+\setlength{\evensidemargin}{-0.08in}   %-0.08in
+\setlength{\textheight}{9.2in} %9.0in
+\setlength{\textwidth}{6.0in} %6.0in
+\setlength{\headheight}{15pt} % not set
+\setlength{\voffset}{-0.2in} % not set
+
+%
+% Environments
+%
+
+% This macro define an environment for front matter that is always 
+% single column even in a double-column document.
+
+\newenvironment{alwayssingle}{%
+       \@restonecolfalse
+       \if@twocolumn\@restonecoltrue\onecolumn
+       \else\if@openright\cleardoublepage\else\clearpage\fi
+       \fi}%
+       {\if@restonecol\twocolumn
+       \else\newpage\thispagestyle{empty}\fi}
+
+%define title page layout
+\renewcommand{\maketitle}{%
+\begin{alwayssingle}
+    \renewcommand{\footnotesize}{\small}
+    \renewcommand{\footnoterule}{\relax}
+    \thispagestyle{empty}
+  \null\vfill
+  \begin{center}
+    { \Huge {\bfseries {\@title}} \par}
+{\large \vspace*{40mm} {\logo \par} \vspace*{25mm}}
+    {{\Large \@author} \par}
+{\large \vspace*{1.5ex} % 1ex
+    {{\@college} \par}
+\vspace*{1ex}
+    {University of Oxford \par}
+\vspace*{25mm}
+    {{\submittedtext} \par}
+\vspace*{1ex}
+    {\it {\@degree} \par}
+\vspace*{2ex}
+    {\@degreedate}}
+  \end{center}
+  \null\vfill
+\end{alwayssingle}}
+
+% DEDICATION
+%
+% The dedication environment makes sure the dedication gets its
+% own page and is set out in verse format.
+
+\newenvironment{dedication}
+{\begin{alwayssingle}
+  \thispagestyle{empty}
+  \begin{center}
+  \vspace*{1.5cm}
+  {\LARGE }
+  \end{center}
+  \vspace{0.5cm}
+  \begin{verse}\begin{center}}
+{\end{center}\end{verse}\end{alwayssingle}}
+
+
+% ACKNOWLEDGEMENTS
+%
+% The acknowledgements environment puts a large, bold, centered 
+% "Acknowledgements" label at the top of the page. The acknowledgements
+% themselves appear in a quote environment, i.e. tabbed in at both sides, and
+% on its own page.
+
+\newenvironment{acknowledgements}
+{\begin{alwayssingle} \thispagestyle{empty}
+\begin{center}
+\vspace*{1.5cm}
+{\Large \bfseries Acknowledgements}
+\end{center}
+\vspace{0.5cm}
+\begin{quote}}
+{\end{quote}\end{alwayssingle}}
+
+% The acknowledgementslong environment puts a large, bold, centered 
+% "Acknowledgements" label at the top of the page. The acknowledgement itself 
+% does not appears in a quote environment so you can get more in.
+
+\newenvironment{acknowledgementslong}
+{\begin{alwayssingle} \thispagestyle{empty}
+\begin{center}
+\vspace*{1.5cm}
+{\Large \bfseries Acknowledgements}
+\end{center}
+\vspace{0.5cm}}
+{\end{alwayssingle}}
+
+% STATEMENT OF ORIGINALITY (AS SUGGESTED BY GSW)
+%
+% The originality environment puts a large, bold, centered 
+% "Statement of originality" label at the top of the page. The statement 
+% of originality itself appears in a quote environment, i.e. tabbed in at 
+% both sides, and on its own page.
+
+\newenvironment{originality}
+{\begin{alwayssingle} \thispagestyle{empty}
+\begin{center}
+\vspace*{1.5cm}
+{\Large \bfseries Statement of Originality}
+\end{center}
+\vspace{0.5cm}
+\begin{quote}}
+{\end{quote}\end{alwayssingle}}
+
+% The originalitylong environment puts a large, bold, centered 
+% "Statement of originality" label at the top of the page. The statement 
+% of originality itself does not appears in a quote environment so you can 
+% get more in.
+
+\newenvironment{originalitylong}
+{\begin{alwayssingle} \thispagestyle{empty}
+\begin{center}
+\vspace*{1.5cm}
+{\Large \bfseries Statement of Originality}
+\end{center}
+\vspace{0.5cm}}
+{\end{alwayssingle}}
+
+
+%ABSTRACT
+%
+%The abstract environment puts a large, bold, centered "Abstract" label at
+%the top of the page. The abstract itself appears in a quote environment,
+%i.e. tabbed in at both sides, and on its own page.
+
+\renewenvironment{abstract} {\begin{alwayssingle} \thispagestyle{empty}
+  \begin{center}
+  \vspace*{1.5cm}
+  {\Large \bfseries  Abstract}
+  \end{center}
+  \vspace{0.5cm}
+   \begin{quote}}
+{\end{quote}\end{alwayssingle}}
+
+%The abstractlong environment puts a large, bold, centered "Abstract" label at
+%the top of the page. The abstract itself does not appears in a quote
+%environment so you can get more in.
+
+\newenvironment{abstractlong} {\begin{alwayssingle} \thispagestyle{empty}
+  \begin{center}
+  \vspace*{1.5cm}
+  {\Large \bfseries  Abstract}
+  \end{center}
+  \vspace{0.5cm}}
+{\end{alwayssingle}}
+
+%The abstractseparate environment is for running of a page with the abstract
+%on including title and author etc as required to be handed in separately
+
+\newenvironment{abstractseparate} {\begin{alwayssingle} \thispagestyle{empty}
+  \vspace*{-1in}
+ \begin{center}
+    { \Large {\bfseries {\@title}} \par}
+    {{\large \vspace*{1ex} \@author} \par}
+{\large \vspace*{1ex}
+    {{\@college} \par}
+    {University of Oxford \par}
+\vspace*{1ex}
+    {{\it \submittedtext} \par}
+    {\it {\@degree} \par}
+\vspace*{2ex}
+    {\@degreedate}}
+  \end{center}}
+{\end{alwayssingle}}
+
+%ROMANPAGES
+%
+% The romanpages environment set the page numbering to lowercase roman one
+% for the contents and figures lists. It also resets
+% page-numbering for the remainder of the dissertation (arabic, starting at 1).
+
+\newenvironment{romanpages}
+{\cleardoublepage\setcounter{page}{1}\renewcommand{\thepage}{\roman{page}}}
+{\cleardoublepage\renewcommand{\thepage}{\arabic{page}}\setcounter{page}{1}}
diff --git a/perf.sh b/extra/perf.sh
similarity index 86%
rename from perf.sh
rename to extra/perf.sh
index b70ce21..6f412a3 100644
--- a/perf.sh
+++ b/extra/perf.sh
@@ -1,5 +1,5 @@
 DIR="$(mktemp -d)"
-cp tests/*_in.* $DIR
+cp ../tests/*_in.* $DIR
 
 echo "Test files:"
 for f in $DIR/*; do
@@ -15,6 +15,6 @@ echo "$(ls -lh $DIR | head -n 1 | cut --delimiter=" " --fields 2)"
 echo
 
 hyperfine --warmup 2 \
-    -n "tex-fmt" "./target/release/tex-fmt $DIR/*" \
+    -n "tex-fmt" "../target/release/tex-fmt $DIR/*" \
     -n "latexindent" "latexindent $DIR/*" \
     -n "latexindent -m" "latexindent -m $DIR/*"
diff --git a/prof.sh b/extra/prof.sh
similarity index 69%
rename from prof.sh
rename to extra/prof.sh
index 1b3bdaf..ec75b82 100644
--- a/prof.sh
+++ b/extra/prof.sh
@@ -1,5 +1,5 @@
 DIR="$(mktemp -d)"
-cp tests/phd_dissertation_in.tex $DIR
+cp ../tests/phd_dissertation_in.tex $DIR
 
 echo "Test file:"
 for f in $DIR/*.tex; do
@@ -8,4 +8,4 @@ for f in $DIR/*.tex; do
     echo "$(ls -sh $f | cut --delimiter=" " --fields 1)"
 done
 
-flamegraph -F 30000 -- ./target/release/tex-fmt $DIR/*.tex
+flamegraph -F 30000 -- ../target/release/tex-fmt $DIR/*.tex
diff --git a/extra/puthesis.cls b/extra/puthesis.cls
new file mode 100644
index 0000000..ce666c7
--- /dev/null
+++ b/extra/puthesis.cls
@@ -0,0 +1,134 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{puthesis}
+\RequirePackage{setspace}
+\RequirePackage{xcolor}
+\def\current@color{ Black}
+\newcounter{subyear}
+\setcounter{subyear}{\number\year}
+\def\submitted#1{\gdef\@submitted{#1}}
+\def\@submittedyear{\ifnum\month>10 \stepcounter{subyear}\thesubyear
+  \else\thesubyear\fi}
+\def\@submittedmonth{\ifnum\month>10 January\else\ifnum\month>8 November
+  \else\ifnum\month>6 September\else May\fi\fi\fi}
+\def\adviser#1{\gdef\@adviser{#1}}
+\long\def\@abstract{\@latex@error{No \noexpand\abstract given}\@ehc}
+\newcommand*{\frontmatter}{
+  %\pagenumbering{roman}
+  }
+\newcommand*{\mainmatter}{
+  %\pagenumbering{arabic}
+}
+\newcommand*{\makelot}{}
+\newcommand*{\makelof}{}
+\newcommand*{\makelos}{}
+\newcommand*{\begincmd}{
+\doublespacing
+\frontmatter\maketitlepage\makecopyrightpage\makeabstract
+\makeacknowledgments\makededication\tableofcontents\clearpage
+\makelot\clearpage\makelof\clearpage\makelos
+\clearpage\mainmatter}
+\def\@submitted{\@submittedmonth~\@submittedyear}
+\def\@dept{Operations Research and Financial Engineering}
+\def\@deptpref{Department of}
+\def\departmentprefix#1{\gdef\@deptpref{#1}}
+\def\department#1{\gdef\@dept{#1}}
+\long\def\acknowledgments#1{\gdef\@acknowledgments{#1}}
+\def\dedication#1{\gdef\@dedication{#1}}
+\newcommand{\maketitlepage}{{
+  \thispagestyle{empty}
+  \sc
+  \vspace*{0in}
+  \begin{center}
+    \LARGE \@title
+  \end{center}
+  \vspace{.6in}
+  \begin{center}
+    \@author
+  \end{center}
+  \vspace{.6in}
+  \begin{center}
+    A Dissertation \\
+    Presented to the Faculty \\
+    of Princeton University \\
+    in Candidacy for the Degree \\
+    of Doctor of Philosophy
+  \end{center}
+  \vspace{.3in}
+  \begin{center}
+    Recommended for Acceptance \\
+    by the \@deptpref \\
+    \@dept \\
+    Adviser: \@adviser
+  \end{center}
+  \vspace{.3in}
+  \begin{center}
+    \@submitted
+  \end{center}
+  \clearpage
+  }}
+\newcommand*{\makecopyrightpage}{
+  \thispagestyle{empty}
+  \vspace*{0in}
+  \begin{center}
+    \copyright\ Copyright by \@author, \number\year. \\
+    All rights reserved.
+  \end{center}
+  \clearpage}
+\newcommand*{\makeabstract}{
+  \newpage
+  \addcontentsline{toc}{section}{Abstract}
+  \begin{center}
+  \Large \textbf{Abstract}
+  \end{center}
+  \@abstract
+  \clearpage
+  }
+\def\makeacknowledgments{
+  \ifx\@acknowledgments\undefined
+  \else
+    \addcontentsline{toc}{section}{Acknowledgments}
+    \begin{center}
+      \Large \textbf{Acknowledgments}
+    \end{center}
+    \@acknowledgments
+    \clearpage
+  \fi
+  }
+\def\makededication{
+  \ifx\@dedication\undefined
+  \else
+    \vspace*{1.5in}
+    \begin{flushright}
+      \@dedication
+    \end{flushright}
+    \clearpage
+  \fi
+  }
+\DeclareOption{myorder}{
+  \renewcommand*{\begincmd}{\doublespacing}}
+\DeclareOption{lot}{\renewcommand*{\makelot}{
+  \addcontentsline{toc}{section}{List of Tables}\listoftables}}
+\DeclareOption{lof}{\renewcommand*{\makelof}{
+  \addcontentsline{toc}{section}{List of Figures and Tables}\listoffigures}}
+\DeclareOption{los}{
+  \renewcommand*{\makelos}{
+    \RequirePackage{losymbol}
+    \section*{List of Symbols\@mkboth {LIST OF SYMBOLS}{LIST OF SYMBOLS}}
+    \@starttoc{los}
+    \addcontentsline{toc}{section}{List of Symbols}
+  }
+}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
+\ProcessOptions
+\LoadClass{report}
+\setlength{\oddsidemargin}{0.2in}
+\setlength{\evensidemargin}{0.2in}
+\setlength{\topmargin}{0in}
+\setlength{\headheight}{0in}
+\setlength{\headsep}{0in}
+\setlength{\textheight}{8.9in}
+\setlength{\textwidth}{6.1in}
+\setlength{\footskip}{0.5in}
+\long\def\abstract#1{\gdef\@abstract{#1}}
+\AtBeginDocument{\begincmd}
+\endinput
diff --git a/tests/phd_dissertation_in.tex b/tests/phd_dissertation_in.tex
index 9c88c93..afd392a 100644
--- a/tests/phd_dissertation_in.tex
+++ b/tests/phd_dissertation_in.tex
@@ -2,7 +2,7 @@
 
 %! TeX root = phd_dissertation.tex
 
-\pdfvariable suppressoptionalinfo 512\relax
+%\pdfvariable suppressoptionalinfo 512\relax
 \documentclass[11pt,lof]{puthesis}
 
 % packages
@@ -821,19 +821,19 @@ \subsection{The Mondrian process}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/plot_mondrian_process_1.pdf}
+%\includegraphics[scale=0.64]{graphics/plot_mondrian_process_1.pdf}
 \caption{$\lambda = 3$}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/plot_mondrian_process_2.pdf}
+%\includegraphics[scale=0.64]{graphics/plot_mondrian_process_2.pdf}
 \caption{$\lambda = 10$}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/plot_mondrian_process_3.pdf}
+%\includegraphics[scale=0.64]{graphics/plot_mondrian_process_3.pdf}
 \caption{$\lambda = 30$}
 \end{subfigure}
 %
@@ -2274,11 +2274,11 @@ \section{Illustrative example: weather forecasting}%
 \centering
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_data.png}%
+%\includegraphics[scale=0.64]{graphics/weather_data.png}%
 \end{subfigure}
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_data_filled_partition.png}%
+%\includegraphics[scale=0.64]{graphics/weather_data_filled_partition.png}%
 \end{subfigure}
 \caption[Australian weather forecasting data]{
 Australian weather forecasting data. Left: colors indicate the response
@@ -2322,11 +2322,11 @@ \section{Illustrative example: weather forecasting}%
 \centering
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_forest_2.png}%
+%\includegraphics[scale=0.64]{graphics/weather_forest_2.png}%
 \end{subfigure}
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_forest_design.png}%
+%\includegraphics[scale=0.64]{graphics/weather_forest_design.png}%
 \end{subfigure}
 \caption[Fitting Mondrian random forests to the Australian weather data]{
 Fitting Mondrian random forests to the Australian weather data.
@@ -2355,11 +2355,11 @@ \section{Illustrative example: weather forecasting}%
 \centering
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_gcv.png}%
+%\includegraphics[scale=0.64]{graphics/weather_gcv.png}%
 \end{subfigure}
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/weather_debiased_forest_design.png}%
+%\includegraphics[scale=0.64]{graphics/weather_debiased_forest_design.png}%
 \end{subfigure}
 \caption[Cross-validation and debiasing for the Australian weather data]{
 Left: mean squared error and generalized cross-validation scores
@@ -3188,21 +3188,21 @@ \subsection{Hoeffding-type decomposition and degeneracy}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/distribution_plot_total.pdf}
+%\includegraphics[scale=0.64]{graphics/distribution_plot_total.pdf}
 \caption{Total degeneracy, \\
 $\pi = \left( \frac{1}{2}, 0, \frac{1}{2} \right)$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/distribution_plot_partial.pdf}
+%\includegraphics[scale=0.64]{graphics/distribution_plot_partial.pdf}
 \caption{Partial degeneracy, \\
 $\pi = \left( \frac{1}{4}, 0, \frac{3}{4} \right)$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/distribution_plot_none.pdf}
+%\includegraphics[scale=0.64]{graphics/distribution_plot_none.pdf}
 \caption{No degeneracy, \\
 $\pi = \left( \frac{1}{5}, \frac{1}{5}, \frac{3}{5} \right)$.}
 \end{subfigure}
@@ -3953,21 +3953,21 @@ \section{Simulations}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/outcome_plot_total.pdf}
+%\includegraphics[scale=0.64]{graphics/outcome_plot_total.pdf}
 \caption{Total degeneracy, \\
 $\pi = \left( \frac{1}{2}, 0, \frac{1}{2} \right)$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/outcome_plot_partial.pdf}
+%\includegraphics[scale=0.64]{graphics/outcome_plot_partial.pdf}
 \caption{Partial degeneracy, \\
 $\pi = \left( \frac{1}{4}, 0, \frac{3}{4} \right)$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/outcome_plot_none.pdf}
+%\includegraphics[scale=0.64]{graphics/outcome_plot_none.pdf}
 \caption{No degeneracy, \\
 $\pi = \left( \frac{1}{5}, \frac{1}{5}, \frac{3}{5} \right)$.}
 \end{subfigure}
@@ -4267,19 +4267,19 @@ \subsection{Application to trade data}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_1995.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_1995.pdf}
 \caption{Year 1995, $\hat h_{\ROT} = 1.27$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_1995_2000.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_1995_2000.pdf}
 \caption{Year 2000, $\hat h_{\ROT} = 1.31$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_1995_2005.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_1995_2005.pdf}
 \caption{Year 2005, $\hat h_{\ROT} = 1.37$.}
 \end{subfigure}
 %
@@ -4296,19 +4296,19 @@ \subsection{Application to trade data}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_gdp_1995.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_gdp_1995.pdf}
 \caption{Year 1995}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_gdp_2000.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_gdp_2000.pdf}
 \caption{Year 2000}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_gdp_2005.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_gdp_2005.pdf}
 \caption{Year 2005}
 \end{subfigure}
 %
@@ -4347,19 +4347,19 @@ \subsection{Application to trade data}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995.pdf}
 \caption{Year 1995, $\hat h_{\ROT} = 1.27$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2000.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2000.pdf}
 \caption{Year 2000, $\hat h_{\ROT} = 1.31$.}
 \end{subfigure}
 %
 \begin{subfigure}{0.32\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2005.pdf}
+%\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2005.pdf}
 \caption{Year 2005, $\hat h_{\ROT} = 1.37$.}
 \end{subfigure}
 %
@@ -5719,12 +5719,12 @@ \subsection{Motivating example: kernel density estimation}
 \centering
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/sim_2.pdf}
+%\includegraphics[scale=0.64]{graphics/sim_2.pdf}
 \caption{$h = 0.03$}
 \end{subfigure}
 \begin{subfigure}{0.49\textwidth}
 \centering
-\includegraphics[scale=0.64]{graphics/sim_1.pdf}
+%\includegraphics[scale=0.64]{graphics/sim_1.pdf}
 \caption{$h = 0.01$}
 \end{subfigure}
 \caption[Minimum eigenvalue of the kernel density covariance matrix]{
diff --git a/tests/phd_dissertation_out.tex b/tests/phd_dissertation_out.tex
index 3e11bee..a0fe398 100644
--- a/tests/phd_dissertation_out.tex
+++ b/tests/phd_dissertation_out.tex
@@ -2,7 +2,7 @@
 
 %! TeX root = phd_dissertation.tex
 
-\pdfvariable suppressoptionalinfo 512\relax
+%\pdfvariable suppressoptionalinfo 512\relax
 \documentclass[11pt,lof]{puthesis}
 
 % packages
@@ -833,19 +833,19 @@ \subsection{The Mondrian process}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/plot_mondrian_process_1.pdf}
+    %\includegraphics[scale=0.64]{graphics/plot_mondrian_process_1.pdf}
     \caption{$\lambda = 3$}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/plot_mondrian_process_2.pdf}
+    %\includegraphics[scale=0.64]{graphics/plot_mondrian_process_2.pdf}
     \caption{$\lambda = 10$}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/plot_mondrian_process_3.pdf}
+    %\includegraphics[scale=0.64]{graphics/plot_mondrian_process_3.pdf}
     \caption{$\lambda = 30$}
   \end{subfigure}
   %
@@ -2286,11 +2286,11 @@ \section{Illustrative example: weather forecasting}%
   \centering
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_data.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_data.png}%
   \end{subfigure}
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_data_filled_partition.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_data_filled_partition.png}%
   \end{subfigure}
   \caption[Australian weather forecasting data]{
     Australian weather forecasting data. Left: colors indicate the response
@@ -2334,11 +2334,11 @@ \section{Illustrative example: weather forecasting}%
   \centering
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_forest_2.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_forest_2.png}%
   \end{subfigure}
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_forest_design.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_forest_design.png}%
   \end{subfigure}
   \caption[Fitting Mondrian random forests to the Australian weather data]{
     Fitting Mondrian random forests to the Australian weather data.
@@ -2367,11 +2367,11 @@ \section{Illustrative example: weather forecasting}%
   \centering
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_gcv.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_gcv.png}%
   \end{subfigure}
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/weather_debiased_forest_design.png}%
+    %\includegraphics[scale=0.64]{graphics/weather_debiased_forest_design.png}%
   \end{subfigure}
   \caption[Cross-validation and debiasing for the Australian weather data]{
     Left: mean squared error and generalized cross-validation scores
@@ -3200,21 +3200,21 @@ \subsection{Hoeffding-type decomposition and degeneracy}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/distribution_plot_total.pdf}
+    %\includegraphics[scale=0.64]{graphics/distribution_plot_total.pdf}
     \caption{Total degeneracy, \\
     $\pi = \left( \frac{1}{2}, 0, \frac{1}{2} \right)$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/distribution_plot_partial.pdf}
+    %\includegraphics[scale=0.64]{graphics/distribution_plot_partial.pdf}
     \caption{Partial degeneracy, \\
     $\pi = \left( \frac{1}{4}, 0, \frac{3}{4} \right)$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/distribution_plot_none.pdf}
+    %\includegraphics[scale=0.64]{graphics/distribution_plot_none.pdf}
     \caption{No degeneracy, \\
     $\pi = \left( \frac{1}{5}, \frac{1}{5}, \frac{3}{5} \right)$.}
   \end{subfigure}
@@ -3965,21 +3965,21 @@ \section{Simulations}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/outcome_plot_total.pdf}
+    %\includegraphics[scale=0.64]{graphics/outcome_plot_total.pdf}
     \caption{Total degeneracy, \\
     $\pi = \left( \frac{1}{2}, 0, \frac{1}{2} \right)$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/outcome_plot_partial.pdf}
+    %\includegraphics[scale=0.64]{graphics/outcome_plot_partial.pdf}
     \caption{Partial degeneracy, \\
     $\pi = \left( \frac{1}{4}, 0, \frac{3}{4} \right)$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/outcome_plot_none.pdf}
+    %\includegraphics[scale=0.64]{graphics/outcome_plot_none.pdf}
     \caption{No degeneracy, \\
     $\pi = \left( \frac{1}{5}, \frac{1}{5}, \frac{3}{5} \right)$.}
   \end{subfigure}
@@ -4279,19 +4279,19 @@ \subsection{Application to trade data}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_1995.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_1995.pdf}
     \caption{Year 1995, $\hat h_{\ROT} = 1.27$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_1995_2000.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_1995_2000.pdf}
     \caption{Year 2000, $\hat h_{\ROT} = 1.31$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_1995_2005.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_1995_2005.pdf}
     \caption{Year 2005, $\hat h_{\ROT} = 1.37$.}
   \end{subfigure}
   %
@@ -4308,19 +4308,19 @@ \subsection{Application to trade data}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_gdp_1995.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_gdp_1995.pdf}
     \caption{Year 1995}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_gdp_2000.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_gdp_2000.pdf}
     \caption{Year 2000}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_gdp_2005.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_gdp_2005.pdf}
     \caption{Year 2005}
   \end{subfigure}
   %
@@ -4359,19 +4359,19 @@ \subsection{Application to trade data}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995.pdf}
     \caption{Year 1995, $\hat h_{\ROT} = 1.27$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2000.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2000.pdf}
     \caption{Year 2000, $\hat h_{\ROT} = 1.31$.}
   \end{subfigure}
   %
   \begin{subfigure}{0.32\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2005.pdf}
+    %\includegraphics[scale=0.64]{graphics/trade_plot_parametric_1995_2005.pdf}
     \caption{Year 2005, $\hat h_{\ROT} = 1.37$.}
   \end{subfigure}
   %
@@ -5731,12 +5731,12 @@ \subsection{Motivating example: kernel density estimation}
   \centering
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/sim_2.pdf}
+    %\includegraphics[scale=0.64]{graphics/sim_2.pdf}
     \caption{$h = 0.03$}
   \end{subfigure}
   \begin{subfigure}{0.49\textwidth}
     \centering
-    \includegraphics[scale=0.64]{graphics/sim_1.pdf}
+    %\includegraphics[scale=0.64]{graphics/sim_1.pdf}
     \caption{$h = 0.01$}
   \end{subfigure}
   \caption[Minimum eigenvalue of the kernel density covariance matrix]{