diff --git a/.gitignore b/.gitignore
index dab99eb..3786286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.log
+*.lof
+*.lot
 *.aux
 *.run.xml
 *.bcf
diff --git a/Chapter_Makefile b/Chapter_Makefile
index f6e5744..0e211bb 100644
--- a/Chapter_Makefile
+++ b/Chapter_Makefile
@@ -36,5 +36,6 @@ update-figures:
 .PHONY: clean
 clean:
 	rm -f **.aux **.bbl **.bcf **.log **.blg
+	rm -f **.mtc **.mtc*
 	rm -f **.out **.run.xml **/texput.log 
 
diff --git a/Makefile b/Makefile
index 5edff5d..33cfe0d 100644
--- a/Makefile
+++ b/Makefile
@@ -39,5 +39,6 @@ update-figures:
 .PHONY: clean
 clean:
 	rm -f **.aux **.bbl **.bcf **.log **.blg
+	rm -f **.mtc **.mtc* **.maf **.toc
 	rm -f **.out **.run.xml **/texput.log 
 
diff --git a/thesis.tex b/thesis.tex
index d9e74f2..e3abccc 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -27,6 +27,10 @@
 {\Large \textbf{Draft build}, git revision \texttt{\input{version}}}
 \fi
 
+\tableofcontents
+\listoffigures
+\listoftables
+
 \dochapter{chapter-introduction} % Status: TODO
 \dochapter{chapter-hsms} % Status: TODO
 \dochapter{chapter-ihsm} % Status: Copy-paste done, build works, integration TODO