diff --git a/.gitignore b/.gitignore
index 3f52842..3f9eded 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
+*.aux
+*.bbl
+*.bib
+*.blg
 *.fdb_latexmk
 *.fls
-*.aux
-*.out
-*.log
 *.gz
+*.log
+*.out
 *.pdf
-*.bbl
-*.blg
-template.bib
+*.swp
 Thumbs.db
-testsuite/mfo.jpg
-testsuite/snapshotmfo.cls
-testsuite/template.tex
-
+testsuite/data/mfo.jpg
+testsuite/data/snapshotmfo.cls
+testsuite/data/template.tex
+testsuite/data/trackchanges.sty
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4c393a2..324c7ec 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,30 @@
 RELEASE-NOTES.txt of https://github.com/MFOberwolfach/SNAPSHOTS
 ===============================================================
 
+
+release v2.2.0
+==============
+
+visible changes
+---------------
+* snapshot.cls: The ISSN, that the snapshots series has received
+recently, is shown on the last page.
+* template.tex: image credits now use autoref
+* template.tex: sample bibliography updated
+
+everything else
+---------------
+* snapshotmfo.cls now requires the hypcap package
+* template.tex: improved spelling, wording and comments
+* template.tex: hint for using \creditsversionone removed
+* testsuite updated and improved
+* snapshotmfo.cls: workaround for encoding problem with pdf
+metadata, cf. snapshotmfo.cls, line 240 et seqq.
+
+Thanks to Moritz Firsching for incorporating the changes suggested
+at the Edithon in December 2017!
+
+
 release v2.1.1
 ==============
 
diff --git a/snapshotmfo.cls b/snapshotmfo.cls
index 9723d4c..c57d0c3 100644
--- a/snapshotmfo.cls
+++ b/snapshotmfo.cls
@@ -1,5 +1,5 @@
 %% snapshotmfo.cls
-%% Copyright 2014 - 2017 Mathematisches Forschungsinstitut Oberwolfach, www.mfo.de
+%% Copyright 2014 - 2018 Mathematisches Forschungsinstitut Oberwolfach, www.mfo.de
 %%  developed within the project IMAGINARY, www.imaginary.org
 %%  supported by the Klaus Tschira Stiftung
 %
@@ -33,9 +33,9 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \listfiles
-\ProvidesClass{snapshotmfo}[2014/07/31 Document class for "Snapshots of modern mathematics from Oberwolfach"]
+\ProvidesClass{snapshotmfo}[2018/10/23 Document class for "Snapshots of modern mathematics from Oberwolfach"]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% output warning if obsolute features are used
+% output warning if obsolete features are used
 \IfFileExists{nag.sty}{\RequirePackage[l2tabu]{nag}}{}
 %
 \LoadClass[10pt,twoside]{scrartcl} 
@@ -237,7 +237,10 @@
   \newcscaptionname{german,ngerman}{snaphot@l@categorization@connect@humanities and social sciences}{Geistes- und Sozialwissenschaften}
   \newcscaptionname{german,ngerman}{snaphot@l@categorization@connect@life science}{Lebenswissenschaften}
   \newcscaptionname{german,ngerman}{snaphot@l@categorization@connect@physics}{Physik}
-  \newcscaptionname{german,ngerman}{snaphot@l@categorization@connect@reflections on mathematics}{Betrachtungen \texorpdfstring{\"uber}{über} Mathematik}
+  % Control sequences evaluating to the categorizations are written to the aux file and used as pdf meta data on the next run of pdflatex.
+  % As some tex installations on some operating systems write the aux file ISO-8859 encoded, but read it UTF-8 encoded, it is safer to avoid
+  % umlauts in the categorization. This affects only german snapshots related to "Betrachtungen über Mathematik":
+  \newcscaptionname{german,ngerman}{snaphot@l@categorization@connect@reflections on mathematics}{Betrachtungen \texorpdfstring{\"uber}{ueber} Mathematik}
   % section name for image credits
   \newcscaptionname{english,USenglish,UKenglish}{snaphot@l@image credits}{Image credits}
   \newcscaptionname{german,ngerman}{snaphot@l@image credits}{Bildquellen}  
@@ -742,6 +745,9 @@
       \textit{\snapshot@l@license}\\*
       \snapshot@license\\[\medskipamount]
       %
+      \textit{ISSN}\\*
+      2626-1995\\[\medskipamount]
+      %
       \textit{\snapshot@l@doi}\\*
       \snapshot@doilink%
     \end{multicols}%
diff --git a/template.pdf b/template.pdf
index a15ac02..893f5fe 100644
Binary files a/template.pdf and b/template.pdf differ
diff --git a/template.tex b/template.tex
index cce0b4a..4e8add9 100644
--- a/template.tex
+++ b/template.tex
@@ -111,7 +111,7 @@
   author = {Knuth, D. E.},
   year = {1984},
   edition={1},
-  publisher = {Addison-Wesley},
+  publisher = {Addison-Wesley}
 }
 
 @misc{wikiMath,
@@ -168,7 +168,7 @@
 
 %%% Please insert the main body of your snapshot here.
 \section[Optional plain text substitute for PDF bookmark]{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
 
 We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.
 
@@ -228,12 +228,10 @@ \section{More information}
 %\begin{thebibliography}{}
 %\bibitem[1]{sample14}A. Candidate, {\slshape Thesis title}, PhD thesis, MFO, 2014.
 %\bibitem[2]{sample11}C. Example, {\slshape A new perspective on mathematics}, New perspectives on arts and sciences, 2011.
-%\bibitem[3]{snapshot}S. Jahns and L. Renner, {\slshape The first snapshot}, Snapshots of modern mathematics {\bfseries 1} (2014), no.\ 1, 1--10.
-%\bibitem[4]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984, ISBN 978-0201134483.
-%\bibitem[5]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
-%\bibitem[6]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
-%\bibitem[7]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
+%\bibitem[3]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984.
+%\bibitem[4]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
+%\bibitem[5]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
+%\bibitem[6]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
 %\end{thebibliography}
 
 \end{document}
-\grid
diff --git a/testsuite/data/external-bibliography.bib b/testsuite/data/external-bibliography.bib
index 13d3945..30f55c0 100644
--- a/testsuite/data/external-bibliography.bib
+++ b/testsuite/data/external-bibliography.bib
@@ -7,19 +7,7 @@ @book{knuth1984texbook
   author = {Knuth, D. E.},
   year = {1984},
   edition={1},
-  publisher = {Addison-Wesley},
-  isbn = {978-0201134483}
-}
-
-@article{snapshot,
-  title = {The first snapshot},
-  author = {Jahns, S. and Renner, L.},
-  journal = {Snapshots of modern mathematics},
-  volume = {1},
-  number = {1},
-  pages = {1--10},
-  year = {2014},
-  publisher = {MFO}
+  publisher = {Addison-Wesley}
 }
 
 @misc{wikiMath,
diff --git a/testsuite/data/test-autoref-english.tex b/testsuite/data/test-autoref-english.tex
index 603dfcc..35b90ca 100644
--- a/testsuite/data/test-autoref-english.tex
+++ b/testsuite/data/test-autoref-english.tex
@@ -48,7 +48,7 @@ \subsection{A subsection}
 1+1&=2,\\\label{char.2}
 1+1&=0.
 \end{align}
-Formula \eqref{real} refers to $\mathbb{R}$, formula \eqref{char.2} does not.
+Formula \eqref{real} refers to $\mathbb{R}$, Formula \eqref{char.2} does not.
 
 
 \section{Another section heading}
@@ -61,5 +61,9 @@ \section{Another section heading}
 \label{fig:maya}
 \end{figure}
 
+\begin{imagecredits}
+  \item[\autoref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
+  \item[\autoref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
+\end{imagecredits}
 
 \end{document}
diff --git a/testsuite/data/test-autoref-german.tex b/testsuite/data/test-autoref-german.tex
index 0134acf..dc8ada8 100644
--- a/testsuite/data/test-autoref-german.tex
+++ b/testsuite/data/test-autoref-german.tex
@@ -48,7 +48,7 @@ \subsection{A subsection}
 1+1&=2,\\\label{char.2}
 1+1&=0.
 \end{align}
-Formula \eqref{real} refers to $\mathbb{R}$, formula \eqref{char.2} does not.
+Formula \eqref{real} refers to $\mathbb{R}$, Formula \eqref{char.2} does not.
 
 
 \section{Another section heading}
@@ -61,5 +61,9 @@ \section{Another section heading}
 \label{fig:maya}
 \end{figure}
 
+\begin{imagecredits}
+  \item[\autoref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
+  \item[\autoref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
+\end{imagecredits}
 
 \end{document}
diff --git a/testsuite/data/test-junioreditor-german-plural-male.tex b/testsuite/data/test-junioreditor-german-plural-male.tex
index a40f951..f14c883 100644
--- a/testsuite/data/test-junioreditor-german-plural-male.tex
+++ b/testsuite/data/test-junioreditor-german-plural-male.tex
@@ -15,7 +15,7 @@
 %\usepackage[USenglish]{babel}
 
 \author{Test Autor}
-\title{mehrere maennliche Autoren}
+\title{mehrere männliche Editoren}
 \begin{document}
 
 \begin{abstract}
diff --git a/testsuite/data/test-references-from-embedded-bib-file.tex b/testsuite/data/test-references-from-embedded-bib-file.tex
index 918b61f..3495b36 100644
--- a/testsuite/data/test-references-from-embedded-bib-file.tex
+++ b/testsuite/data/test-references-from-embedded-bib-file.tex
@@ -37,19 +37,7 @@
   author = {Knuth, D. E.},
   year = {1984},
   edition={1},
-  publisher = {Addison-Wesley},
-  isbn = {978-0201134483}
-}
-
-@article{snapshot,
-  title = {The first snapshot},
-  author = {Jahns, S. and Renner, L.},
-  journal = {Snapshots of modern mathematics},
-  volume = {1},
-  number = {1},
-  pages = {1--10},
-  year = {2014},
-  publisher = {MFO}
+  publisher = {Addison-Wesley}
 }
 
 @misc{wikiMath,
@@ -120,7 +108,7 @@ \section{Comment on this unit test}
 As this is template.tex's default way to provide references, this test is covered by test-template.tex.
 
 \section{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
 
 We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.
 
diff --git a/testsuite/data/test-references-from-separate-bib-file.tex b/testsuite/data/test-references-from-separate-bib-file.tex
index e3c8e10..019646f 100644
--- a/testsuite/data/test-references-from-separate-bib-file.tex
+++ b/testsuite/data/test-references-from-separate-bib-file.tex
@@ -63,7 +63,7 @@ \section{Comment on this unit test}
 Possible ``BibTeX'' warnings depend on the personal .bib file supplied.
 
 \section{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
 
 We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.
 
diff --git a/testsuite/data/test-references-without-bibtex.tex b/testsuite/data/test-references-without-bibtex.tex
index 72c6c58..ec2b3e9 100644
--- a/testsuite/data/test-references-without-bibtex.tex
+++ b/testsuite/data/test-references-without-bibtex.tex
@@ -54,7 +54,7 @@ \section{Comment on this unit test}
 After two or more compilations of this file there should be no ``LaTeX'' or ``class snapshotmfo'' warnings.
 
 \section{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
 
 We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.
 
@@ -66,10 +66,9 @@ \section{A heading}
 \begin{thebibliography}{}
 \bibitem[1]{sample14}A. Candidate, {\slshape Thesis title}, PhD thesis, MFO, 2014.
 \bibitem[2]{sample11}C. Example, {\slshape A new perspective on mathematics}, New perspectives on arts and sciences, 2011.
-\bibitem[3]{snapshot}S. Jahns and L. Renner, {\slshape The first snapshot}, Snapshots of modern mathematics {\bfseries 1} (2014), no.\ 1, 1--10.
-\bibitem[4]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984, ISBN 978-0201134483.
-\bibitem[5]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
-\bibitem[6]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
-\bibitem[7]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
+\bibitem[3]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984.
+\bibitem[4]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
+\bibitem[5]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
+\bibitem[6]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
 \end{thebibliography}
 \end{document}
diff --git a/testsuite/data/test-template.tex b/testsuite/data/test-template.tex
index bce3992..62f6fcf 100644
--- a/testsuite/data/test-template.tex
+++ b/testsuite/data/test-template.tex
@@ -35,14 +35,13 @@
 \junioreditor{will be filled out by the editors}{junior-editors@mfo.de}
 \senioreditor[f]{Carla Cederbaum}{senior-editor@mfo.de}
 \director[m]{Gerhard Huisken}
-% \junioreditor{First Editor and Second Editor}{junior-editors@mfo.de} "and" will yield the plural "Editors" (Similar for the word "und" in german snapshots).
+% Joining the names of two or more editors by ", " like in
+% \junioreditor{First Editor, Second Editor}{junior-editors@mfo.de} yields the plural in the caption. 
 % With german snapshots the optional argument f for female and m for male of \junioreditor,
 % \senioreditor and \director, resp., will make the caption gender-specific, e.g.
 % \junioreditor[f]{Anne Schuster}{schuster@example.org} will yield "Editorin ..." instead of "Editor/in ..." and
 % \junioreditor[m]{Martin Schuster}{schuster@example.org} will yield "Editor ..." instead of "Editor/in ...".
 
-% Uncomment the following line for snapshots submitted before 2017:
-%\creditsversionone
 
 %%% Commands for editing
 % Uncomment for collaborative editing:
@@ -85,7 +84,6 @@
 \authorinfo{\authorname{Author One} is a professor of pure mathematics at the First University.}
 \authorinfo{\authorname{Author Two} is a lecturer in applied mathematics at the Second Institution.}
 
-
 %%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% There are three ways to provide your references:
 %%% 
@@ -113,19 +111,7 @@
   author = {Knuth, D. E.},
   year = {1984},
   edition={1},
-  publisher = {Addison-Wesley},
-  isbn = {978-0201134483}
-}
-
-@article{snapshot,
-  title = {The first snapshot},
-  author = {Jahns, S. and Renner, L.},
-  journal = {Snapshots of modern mathematics},
-  volume = {1},
-  number = {1},
-  pages = {1--10},
-  year = {2014},
-  publisher = {MFO}
+  publisher = {Addison-Wesley}
 }
 
 @misc{wikiMath,
@@ -172,16 +158,20 @@
 \begin{document}
 
 %%% Please insert your abstract here. 
-\begin{abstract}[Plain text abstract used as PDF meta data (optional)]
-This is your abstract. It should give a brief overview of your snapshot. If possible, please do not use formulas in your abstract. Otherwise, please suggest an additional plain text abstract in square brackets, that can be used in the PDF's metadata field. Please do not use more than 500 symbols.
+\begin{abstract}
+This is your abstract. It should give a brief overview of your snapshot. If possible, please do not use formulas in your abstract. Please do not use more than 500 characters. 
 \end{abstract}
+%%% In case of hyperref warnings like "Token not allowed in a PDF string", please use the following variant of \begin{abstract} instead: 
+%\begin{abstract}[This is a plain text equivalent of your abstract used for the PDF meta data. It should give a brief overview of your snapshot. Please do not use more than 500 characters.]
+%This is your abstract containing some special characters or latex control sequences. It should give a brief overview of your snapshot. Please do not use more than 500 characters.
+%\end{abstract}
 
 \section{Comment on this unit test: test-template.tex}
 test-template.tex differs from template.tex only by this section!
 After the following compilations
 \begin{verbatim}
 pdflatex test-template.tex
-bibtex test-template.bib
+bibtex test-template.aux
 pdflatex test-template.tex
 pdflatex test-template.tex
 \end{verbatim}
@@ -196,7 +186,6 @@ \section{Comment on this unit test: test-template.tex}
 
 Warning--empty language in sample14
 Warning--empty language in sample11
-Warning--empty language in snapshot
 Warning--empty language in knuth1984texbook
 Warning--empty language in sample12
 Warning--empty language in sample13
@@ -205,8 +194,8 @@ \section{Comment on this unit test: test-template.tex}
 
 Using TeXnicCenter with MikTeX on Windows the final compilation summary will read:
 \begin{verbatim}
-LaTeX-Result: 0 Error(s), 6 Warning(s), 2 Bad Box(es), 5 Pages(s)
-BibTeX-Result: 0 Error(s), 7 Warning(s)
+LaTeX-Result: 0 Error(s), 6 Warning(s), 1 Bad Box(es), 5 Pages(s)
+BibTeX-Result: 0 Error(s), 6 Warning(s)
 \end{verbatim}
 
 The ``overwriting file'' warning is inevitable as long as you provide the references the default
@@ -220,7 +209,7 @@ \section{Comment on this unit test: test-template.tex}
 
 %%% Please insert the main body of your snapshot here.
 \section[Optional plain text substitute for PDF bookmark]{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.\\
 
 We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.
 
@@ -238,7 +227,7 @@ \section{Comment on this unit test: test-template.tex}
 1+1&=2,\\\label{char.2}
 1+1&=0.
 \end{align}
-Formula \eqref{real} refers to $\mathbb{R}$, formula \eqref{char.2} does not.
+Formula \eqref{real} refers to $\mathbb{R}$, Formula \eqref{char.2} does not.
 
 \section{More information}
 We have composed guidelines to help you write a beautiful and accessible snapshot which you can download at \href{http://www.mfo.de/snapshots/guidelines-for-snapshots}{www.mfo.de/snapshots/guidelines-for-snapshots}. For more information on the snapshot project (including example snapshots), please see \href{http://www.mfo.de/snapshots}{www.mfo.de/snapshots}.
@@ -260,8 +249,8 @@ \section{More information}
 
 %%% Image credits: If you download an image form Wikipedia or similar sources, please always check the applicable license terms. Most licenses require an adequate attribution. For Wikipedia, you can find the correct reference by clicking on the image and then clicking on the button saying 'More details' and then on the link 'use this file' or similar. Some licenses may have further restrictions, such as 'modifications are not allowed'. If modifications are allowed you may still have to mark those modifications. Please verify that you comply with all license requirements. If you use your own images, please check if you still have the rights of use. The images may be copyrighted by your institution or a publisher of your previous publications.
 \begin{imagecredits}
-  \item[Fig. \ref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
-  \item[Fig. \ref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
+  \item[\autoref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
+  \item[\autoref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
 \end{imagecredits}
 
 %%%%%%%%%%%%%%%% BIBLIOGRAPHY REVISITED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -280,12 +269,10 @@ \section{More information}
 %\begin{thebibliography}{}
 %\bibitem[1]{sample14}A. Candidate, {\slshape Thesis title}, PhD thesis, MFO, 2014.
 %\bibitem[2]{sample11}C. Example, {\slshape A new perspective on mathematics}, New perspectives on arts and sciences, 2011.
-%\bibitem[3]{snapshot}S. Jahns and L. Renner, {\slshape The first snapshot}, Snapshots of modern mathematics {\bfseries 1} (2014), no.\ 1, 1--10.
-%\bibitem[4]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984, ISBN 978-0201134483.
-%\bibitem[5]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
-%\bibitem[6]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
-%\bibitem[7]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
+%\bibitem[3]{knuth1984texbook}D. E. Knuth, {\slshape The TeXbook}, 1st ed., Addison-Wesley, 1984.
+%\bibitem[4]{sample12}J.\ Sample, {\slshape Things you don't know about mathematics}, A bookseries about mathematics, Some publisher, 2012.
+%\bibitem[5]{sample13}\underline{\hphantom{J.\ Sam}}\,, {\slshape Interesting facts in mathematics}, arxiv:8765.4321v1, 2013.
+%\bibitem[6]{wikiMath}Wikipedia, {\slshape Mathematics --- {W}ikipedia{,} The Free Encyclopedia}, 2014, https://en.wikipedia.org/wiki/Mathematics, visited on May 19, 2014.
 %\end{thebibliography}
 
-
 \end{document}
diff --git a/testsuite/data/test-trackchanges.tex b/testsuite/data/test-trackchanges.tex
index 7c43a5e..f1f5bd8 100644
--- a/testsuite/data/test-trackchanges.tex
+++ b/testsuite/data/test-trackchanges.tex
@@ -36,19 +36,7 @@
   author = {Knuth, D. E.},
   year = {1984},
   edition={1},
-  publisher = {Addison-Wesley},
-  isbn = {978-0201134483}
-}
-
-@article{snapshot,
-  title = {The first snapshot},
-  author = {Jahns, S. and Renner, L.},
-  journal = {Snapshots of modern mathematics},
-  volume = {1},
-  number = {1},
-  pages = {1--10},
-  year = {2014},
-  publisher = {MFO}
+  publisher = {Addison-Wesley}
 }
 
 @misc{wikiMath,
@@ -115,7 +103,7 @@ \section{Comment on this unit test}
 
 %%% Please insert the main body of your snapshot here.
 \section{A heading}
-Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{snapshot, knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.
+Your actual snapshot.\footnote{This is a footnote.} As usual, you can give references such as \cite{knuth1984texbook, wikiMath, sample13, sample12, sample11, sample14} via the \verb+\cite+ command.
 
 \change[Alice]{We appreciate if you include images or other graphics that illustrate your snapshot. However, please do keep in mind the copyright issues explained in our email in case you include images and graphics you have not produced yourself.}{Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.}
 
@@ -133,7 +121,7 @@ \subsection{A subsection}
 1+1&=2,\\\label{char.2}
 1+1&=0.
 \end{align}
-Formula \eqref{real} refers to $\mathbb{R}$, formula \eqref{char.2} does not.
+Formula \eqref{real} refers to $\mathbb{R}$, Formula \eqref{char.2} does not.
 
 \section{More information}
 We have composed guidelines to help you write a beautiful and accessible snapshot which you can download at \href{http://www.mfo.de/snapshots/guidelines-for-snapshots}{www.mfo.de/snapshots/guidelines-for-snapshots}. For more information on the snapshot project (including example snapshots), please see \href{http://www.mfo.de/snapshots}{www.mfo.de/snapshots}.
@@ -156,8 +144,8 @@ \section{More information}
 
 %%% Image credits: If you download an image form Wikipedia or similar sources, please always check the applicable license terms. Most licenses require an adequate attribution. For Wikipedia, you can find the correct reference by clicking on the image and then clicking on the button saying 'More details' and then on the link 'use this file' or similar. Some licenses may have further restrictions, such as 'modifications are not allowed'. If modifications are allowed you may still have to mark those modifications. Please verify that you comply with all license requirements. If you use your own images, please check if you still have the rights of use. The images may be copyrighted by your institution or a publisher of your previous publications.
 \begin{imagecredits}
-  \item[Fig. \ref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
-  \item[Fig. \ref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
+  \item[\autoref{fig:sample-image}] Archives of the Mathematisches Forschungsinstitut Oberwolfach,\\\url{http://www.mfo.de}, 2004.
+  \item[\autoref{fig:maya}] ``Maya''. Author: Bryan Derkson. Licensed under Creative Commons Attribution-Share Alike 3.0 via Wikimedia Commons, \url{http://commons.wikimedia.org/wiki/File:Maya.svg}, visited on September 5, 2014.
 \end{imagecredits}
 
 \bibliography{\jobname}
diff --git a/testsuite/programs/copy-aux-files.bash b/testsuite/programs/copy-aux-files.bash
index d76c17a..64280a9 100755
--- a/testsuite/programs/copy-aux-files.bash
+++ b/testsuite/programs/copy-aux-files.bash
@@ -17,20 +17,12 @@ trap finish EXIT
 cd "$__workdir"
 
 ## main program
-m=0
 a="maya.pdf mfo.jpg snapshotmfo.cls trackchanges.sty"
 for f in $a; do
-  if test ! -e "$f" ; then
-    echo "$__script: copying $f ..."
-    cp "../../$f" .
-    m=1
-  fi
+  echo "$__script: copying $f ..."
+  cp "../../$f" .
 done
 
-if test "$m" -eq 1 ; then
-  echo "$__script: The files $a are necessary to compile the test files. Therefore the missing files have been copied into the data directory."
-  read -p 'Press RETURN to proceed!' d 
-else
-  echo "$__script: Copies of the files $a are already in the data directory."
-fi
+echo "$__script: The files $a are necessary to compile the test files. So their latest versions have been copied into the testsuite/data directory."
+read -p 'Press RETURN to proceed!' d 
 
diff --git a/testsuite/programs/copy-aux-files.cmd b/testsuite/programs/copy-aux-files.cmd
index e5485a8..8901c3a 100755
--- a/testsuite/programs/copy-aux-files.cmd
+++ b/testsuite/programs/copy-aux-files.cmd
@@ -1,6 +1,6 @@
 @echo off
 rem This is a windows batch file.
-rem This script copies auxiliary files into the testsuite/data directory.
+rem This script copies auxiliary files into the testsuite\data directory.
 
 rem preparations
 setlocal enableextensions
@@ -11,20 +11,12 @@ set __workdir=%~dp0%..\data
 cd %__workdir% || goto error
 
 rem main program
-set m=0
 set a=maya.pdf mfo.jpg snapshotmfo.cls trackchanges.sty
 for %%f in (%a%) do (
-  if not exist %%f (
-    echo %__script%: copying %%f ...
-    copy ..\..\%%f . || goto error
-	set m=1
-  )
-)
-if %m% equ 1 (
-  echo %__script%: The files %a% are necessary to compile the test files. Therefore the missing files have been copied into this folder.
-) else (
-  echo %__script%: Copies of the files %a% are already in the data directory.
+  echo %__script%: copying %%f ...
+  copy /y ..\..\%%f . || goto error
 )
+echo %__script%: The files %a% are necessary to compile the test files. So their latest versions have been copied into the testsuite\data directory.
 
 :finish
 cd %__olddir%
diff --git a/testsuite/programs/full-test-core.bash b/testsuite/programs/full-test-core.bash
index 90af344..3cbdf35 100755
--- a/testsuite/programs/full-test-core.bash
+++ b/testsuite/programs/full-test-core.bash
@@ -28,8 +28,8 @@ date +'%Y-%m-%d %H:%M:%S'
 
 "${__dir}/copy-aux-files.bash"
 
-echo "$__script: removing previous pdf output ..."
-rm -f all.pdf test-*.pdf
+echo "$__script: removing previous output ..."
+rm -f all.pdf test-*.{aux,bbl,bib,blg,log,out,pdf}
 
 for f in test-*.tex ; do
   g="${f%.*}"
diff --git a/testsuite/programs/full-test.cmd b/testsuite/programs/full-test.cmd
index 77d326a..cca7b60 100755
--- a/testsuite/programs/full-test.cmd
+++ b/testsuite/programs/full-test.cmd
@@ -2,7 +2,7 @@
 rem This is a windows batch file.
 rem This script
 rem  * copies auxiliary files into the data directory,
-rem  * removes previous pdf output,
+rem  * removes previous output,
 rem  * compiles all test-*.tex files thoroughly,
 rem  * merges the pdf output into all.pdf.
 
@@ -19,8 +19,8 @@ echo %__script%: start time: %date% %time:~0,8%
 
 call %__dir%copy-aux-files.cmd || goto error
 
-echo %__script%: removing previous pdf output ...
-del all.pdf test-*.pdf || goto error
+echo %__script%: removing previous output ...
+del all.pdf test-*.aux test-*.bbl test-*.bib test-*.blg test-*.log test-*.out test-*.pdf || goto error
 
 for %%f in (test-*.tex) do (
   echo %__script%: compiling %%~nf ...