diff --git a/ecsdocs.dtx b/ecsdocs.dtx
index bb6d76d98b27b1e9c8fe1b0026f5185803b6f6e7..1dc1968a9d1c6505fa510a4ec88cb00a1b8bf086 100644
--- a/ecsdocs.dtx
+++ b/ecsdocs.dtx
@@ -9,7 +9,7 @@
 % \fi
 %
 
-% \CheckSum{1871}
+% \CheckSum{1908}
 %
 % \iffalse
 % Copyright (C) 2001 by Steve R. Gunn
@@ -348,7 +348,7 @@
 \renewcommand{\subsectionmark}[1]{}
 %</thesis|minithesis|progress|project|report|gdp>
 %<*article>
-\renewcommand{\sectionmark}[1]{\btypeout{\thesection\hspace{1em}#1}}
+\renewcommand{\sectionmark}[1]{\btypeout{\thesection\hspace{1em}}\markboth{}{\thesection.\hspace{1em}#1}}
 \renewcommand{\subsectionmark}[1]{}
 \renewcommand{\subsubsectionmark}[1]{}
 %</article>
@@ -371,6 +371,19 @@
 \if@twocolumn\hbox{}\newpage\fi\fi\fi}
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\cleartoeven}
+%
+%    Define \texttt{cleartoeven} to remove headers from blank pages
+%    and force to even page for appendix or index.
+%
+%    \begin{macrocode}
+\def\cleartoeven{\clearpage\if@twoside \ifodd\c@page
+\hbox{}
+\thispagestyle{empty}
+\newpage
+\if@twocolumn\hbox{}\newpage\fi\fi\fi}
+%    \end{macrocode}
+% \end{macro}
 %
 % \subsection{Mathematics}
 %
@@ -413,7 +426,7 @@
 %   and provide short referencing commands.
 %
 %    \begin{macrocode}
-\usepackage[centerlast,small,sc]{caption2}
+\usepackage[justification=centerlast,font=small,labelfont=sc]{caption}
 \setlength{\captionmargin}{20pt}
 \newcommand{\fref}[1]{Figure~\ref{#1}}
 \newcommand{\tref}[1]{Table~\ref{#1}}
@@ -1442,7 +1455,7 @@ Data: Author (Year) Title. URI [dataset]}
 \hypersetup{colorlinks=true}   % Set to false for black/white printing
 \input{Definitions}            % Include your abbreviations
 %% ----------------------------------------------------------------
-
+%% --------------------THESIS/DOC INFORMATION ---------------------
 \title      {An Investigation into \dots}
 \authors    {\texorpdfstring
              {\href{mailto:S.R.Gunn@ecs.soton.ac.uk}{Steve R. Gunn}}
@@ -1470,6 +1483,7 @@ Data: Author (Year) Title. URI [dataset]}
 \keywords   {}
 
 \begin{document}
+%% ------------------ FRONT MATTER ORGANISATION -------------------
 %<*testthesis>
 \pagenumbering{gobble} % removes page number
 \copyrightDeclaration{} % !!! Comment this line when printing the hardcopy !!!
@@ -1481,18 +1495,18 @@ Data: Author (Year) Title. URI [dataset]}
 \begin{abstract}
 This work is all about \dots
 \end{abstract}
+%<*testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
 \tableofcontents
 \listoffigures
 \listoftables
 %% The List of listings does not, by default, appear in the ToC, so....
 \addtotoc{List of Listings}
 \lstlistoflistings
+%</testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
 \listofsymbols{ll}{$w$ & The weight vector}
 %</testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp>
-%<*testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
-%% -----------------------
-%% Authorship declaration
-%% -----------------------
+%<*testthesis|testminithesis|testproject|testreport|testgdp>
+%% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
 \authorshipdeclaration{\citep{Gunn:2001:pdflatex}, \citep{Lovell:2011:updated} and \citep{Gunn:2011:updated2}}
 %% Or state no citations like below
@@ -1500,10 +1514,10 @@ This work is all about \dots
 %% -----------------------
 \acknowledgements{Thanks to no one.}
 \dedicatory{To \dots}
-%</testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
+%</testthesis|testminithesis|testproject|testreport|testgdp>
 %<*testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 \mainmatter
-%% ----------------------------------------------------------------
+%% ------------------ MAIN MATTER (CONTENT) --------------------
 %</testthesis|testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 %<*testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
 \include{Introduction}