diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..bc8ea05
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,24 @@
+{
+    "latex-workshop.latex.toolchain": [
+        {
+            "command": "pdflatex",
+            "args": [
+                "-synctex=1",
+                "-shell-escape",
+                "-interaction=nonstopmode",
+                "-file-line-error",
+                "%DOC%"
+            ]
+        },
+        {
+            "command": "pdflatex",
+            "args": [
+                "-synctex=1",
+                "-shell-escape",
+                "-interaction=nonstopmode",
+                "-file-line-error",
+                "%DOC%"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/.gitignore b/doc/.gitignore
index 679e4af..99f0d5a 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,10 @@
 /project-root.tex
 /report.aux
 /report.log
+/report.out
+/report.toc
 /report.synctex.gz
+/report.tdo
 /report.pdf
 /javadoc
+/_minted-report
diff --git a/doc/report.tex b/doc/report.tex
index 5675ec3..ae6ebfe 100644
--- a/doc/report.tex
+++ b/doc/report.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper]{article}
+\documentclass[a4paper]{report}
 \usepackage[margin=1in]{geometry}
 \usepackage{graphicx}
 \usepackage{pdfpages}
@@ -7,48 +7,59 @@
 \usepackage{amsfonts}
 \usepackage[scientific-notation=true,round-precision=5,round-mode=figures]{siunitx}
 \usepackage{minted}
+\usepackage{hyperref}
+\usepackage{cleveref}
+\usepackage{subcaption}
+\usepackage{todonotes}
+
+\newenvironment{code}{\captionsetup{type=figure}}{}
+\input{project-root} %requires a line \newcommand{\projectroot}{/absolute/path/to/this/repository}
+\setminted{breaklines}
+\setminted{frame=lines}
+
+\author{Frank Wibbelink (s1184725)}
+\title{Boppi Report}
 
 \begin{document}
-\title{Boppi Report}
 \maketitle
-\vfill
-\author{Frank Wibbelink (s1184725)}
 \newpage
 
 \tableofcontents
 \newpage
 
-\input{project-root}
-\setminted{breaklines}
-\setminted{frame=lines}
+\listoftodos[TODO]
 
-\section{Summary}
+\chapter{Introduction}
 \input{report-summary}
 
-\section{Problems and solutions}
-\input{report-problems}
-
-\section{Language description}
+\chapter{Language description}
 \input{report-description}
 
-\section{Software description}
+\chapter{Software description}
 \input{report-software}
 
-\section{Tests}
+\chapter{ILOC changes}
+\input{report-changes-iloc}
+
+\chapter{Problems and solutions}
+\input{report-problems}
+
+\chapter{Tests}
 \input{report-tests}
 
-\section{Conclusions}
+\chapter{Conclusions}
 \input{report-conclusion}
 
 \newpage
 \appendix
-\section{ANTLR grammars}
+\chapter{ANTLR grammars}
+\label{report-grammar}
 \input{report-grammar}
 
-\section{ANTLR walkers}
+\chapter{ANTLR walkers}
 \input{report-walker}
 
-\section{Test programs}
+\chapter{Test programs}
 \input{report-test-program}
 
 \end{document}