diff --git a/doc/Background.tex b/doc/Background.tex
index fcce639..cfe0470 100644
--- a/doc/Background.tex
+++ b/doc/Background.tex
@@ -107,7 +107,7 @@ more difficult is the use of options within ICMP6.
   \label{fig:icmp6ndp}
 \end{figure}
 The problem arises from the layout of the options, as seen in the
-following quote and in figure \ref{icmp6ndp}:
+following quote and in figure \ref{fig:icmp6ndp}:
 \begin{quote}
 ``Neighbor Discovery messages include zero or more options, some of
 which may appear multiple times in the same message.  Options should
diff --git a/doc/Conclusion.tex b/doc/Conclusion.tex
index a2f8048..4c5819c 100644
--- a/doc/Conclusion.tex
+++ b/doc/Conclusion.tex
@@ -37,7 +37,7 @@ P4/NetFPGA platform is a good showcase for the capabilities of
 P4, demonstrating near line speed P4 programs with good capabilities
 of demonstrating scientific research.
 However, the supporting code toolchain shows strong weaknesses that
-render productive deployements difficult.
+render productive deployments difficult.
 % ----------------------------------------------------------------------
 % Outlook
 
@@ -63,7 +63,7 @@ define data definitions that can be used in various programming
 languages bindings.
 
 % NetFPGA
-The NetFPGA, from the hardware point of view,! is a very
+The NetFPGA, from the hardware point of view, is a very
 interesting hardware platform. Reducing the difficulties
 we experienced with the surrounding toolchain and making
 development experience more consistent has the potential to not only
diff --git a/doc/Results.tex b/doc/Results.tex
index a32ca74..2d2b03d 100644
--- a/doc/Results.tex
+++ b/doc/Results.tex
@@ -71,7 +71,7 @@ The supporting scripts in the P4 toolchain are usually written in
 python2. However python2 ``is
 legacy''~\cite{various:_shoul_i_python_python}. During development
 errors with unicode string handling in python2 caused
-changes to IPv6 addresses.!
+changes to IPv6 addresses.
 % ok
 % ----------------------------------------------------------------------
 \section{\label{results:bmv2}P4/BMV2}
diff --git a/doc/Thesis.pdf b/doc/Thesis.pdf
index 03652a4..98cfb51 100644
Binary files a/doc/Thesis.pdf and b/doc/Thesis.pdf differ