diff --git a/Makefile b/Makefile
index 5c1a768..844fa85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
-FILES= 		tools.tex aims.tex literature.tex tools.bib
-
-USE_LATEXMK= 	yes
-USE_BIBLATEX= 	yes
-
 .PHONY: all
 all: tools.pdf
 
+FILES= 		tools.tex aims.tex literature.tex tools.bib
+
 tools.pdf: ${FILES} llncs
 
 
diff --git a/makefiles b/makefiles
index 67c8f9a..68abd13 160000
--- a/makefiles
+++ b/makefiles
@@ -1 +1 @@
-Subproject commit 67c8f9a2bb4a40a5d1132f5daed39398a599e5db
+Subproject commit 68abd133639608f59a319d26eb154c979a563a57
diff --git a/tools-contents.tex b/tools-contents.tex
index b8e5da7..3d57d3f 100644
--- a/tools-contents.tex
+++ b/tools-contents.tex
@@ -1,4 +1,4 @@
-\title{Tools of the Trade}
+\title{Lab: Tools of the Trade}
 \subtitle{A lab on the practicalities of security}
 
 \author{%
@@ -17,10 +17,10 @@ \section{Introduction}
 systems produced.
 This laboratory assignment focuses on the practical parts of security.
 You have probably read a lot about different cryptographic mechanisms, e.g.~AES 
-\cite{aes} and CBC \cite{blockmodes}; intrusion detection systems of different 
-kinds, e.g.~network \cite{snort} and host-based \cite{ossec} intrusion 
+\cite{aes} and CBC~\cite{blockmodes}; intrusion detection systems of different 
+kinds, e.g.\ network~\cite{snort} and host-based~\cite{ossec} intrusion 
 detection systems.
-You might know that you should use huge prime numbers in RSA \cite{rsa}, but 
+You might know that you should use huge prime numbers in RSA~\cite{rsa}, but 
 how do you actually choose these in practice?
 In this lab you are supposed to answer questions such as this and get to know 
 some implementations of what you previously only knew in theory.
@@ -41,10 +41,9 @@ \subsection{Scope and Aim}
 
 The next section covers what you must read before you understand this 
 assignment and how to do the work.
-Section \ref{sec:tasks} covers the work to be done, i.e.~how you should learn 
-this.
-Section \ref{sec:exam} covers how it will be examined, i.e.~how you show that 
-you have fulfilled the intended learning outcomes given above.
+\Cref{sec:tasks} covers the work to be done, i.e.~how you should learn this.
+\Cref{sec:exam} covers how it will be examined, i.e.~how you show that you have 
+fulfilled the intended learning outcomes given above.
 
 
 \section{Theory}
@@ -63,11 +62,11 @@ \section{Assignment}
   \item In a Diffie-Hellman key exchange you need a generator for a group, how 
     do you find this one?
 
-  \item There is no randomness in a computer program---since these are fully 
-    deterministic---but how do we then get randomness to do cryptography using 
-    a computer?
+  \item There is no randomness in a computer program --- since these are fully 
+    deterministic --- but how do we then get randomness to do cryptography 
+    using a computer?
 
-  \item How do you actually use SHA-256 \cite{shs} or bcrypt \cite{bcrypt} to 
+  \item How do you actually use SHA-256~\cite{shs} or bcrypt~\cite{bcrypt} to 
     protect a password: how should you use them, what values should you use?
 
   \item What features are actually available in an intrusion detection system, 
@@ -124,4 +123,4 @@ \subsubsection*{Acknowledgements}
 \url{https://github.com/dbosk/toolslab/}.
 
 
-\printbibliography
+\printbibliography{}
diff --git a/tools.tex b/tools.tex
index 2e71e22..d253da4 100644
--- a/tools.tex
+++ b/tools.tex
@@ -4,7 +4,8 @@
 \usepackage[swedish,english]{babel}
 \usepackage[hyphens]{url}
 \usepackage{hyperref}
-\usepackage[natbib,style=alphabetic,maxbibnames=99]{biblatex}
+\usepackage{cleveref}
+\usepackage[natbib,style=numeric-comp,maxbibnames=99]{biblatex}
 \addbibresource{tools.bib}
 
 \begin{document}