diff --git a/comments/templates/comments/reply_to_report.html b/comments/templates/comments/reply_to_report.html
index d796bb1210d20cd90057e987d2eb59a5c9755c63..64f28db492efe048647f5a1f9453121ab297c793 100644
--- a/comments/templates/comments/reply_to_report.html
+++ b/comments/templates/comments/reply_to_report.html
@@ -28,6 +28,10 @@
         <div class="row">
             <div class="col-12">
                 <h2 class="highlight">Your Reply to this Report:</h2>
+		{% if is_author %}
+		<p><em>Please focus on responding to the Report. Although you are welcome to mention what you intend to change in your manuscript as a result of this Report, a formal list of changes is best kept as accompaniment to your eventual resubmission.</em></p>
+		<p><em>Attachments are here meant for e.g. informative graphs; please do not attach a new version of your manuscript to this Reply.</em></p>
+		{% endif %}
                 {% url 'comments:reply_to_report' report_id=report.id as add_comment_url %}
                 {% include 'comments/_add_comment_form.html' with url=add_comment_url form=form %}
             {% endif %}
diff --git a/proceedings/templates/partials/proceedings/description.html b/proceedings/templates/partials/proceedings/description.html
index d6ae4a1161497b54bd526dbf2899ca710f1f2e3b..0375ee4b73bdb7eaac45f7e0d4536fa493246e74 100644
--- a/proceedings/templates/partials/proceedings/description.html
+++ b/proceedings/templates/partials/proceedings/description.html
@@ -9,7 +9,7 @@
         Prepare your manuscript according to <a href="{% url 'submissions:author_guidelines' %}">our guidelines</a>, using <a href>our LaTeX template</a>.
     {% endif %}
 </div>
-<p>{{ proceedings.event_description|linebreaksbr }}</p>
+<p>{{ proceedings.event_description|safe|linebreaksbr }}</p>
 
 {% if proceedings.fellowships.guests.exists %}
     <h3>Guest Fellows responsible for this Issue</h3>
diff --git a/proceedings/templates/partials/proceedings/summary.html b/proceedings/templates/partials/proceedings/summary.html
index b7b2e7e513de253e68314826a955d30752d14e04..19ef5615cc6689e391ee66cd3aaf286b09d7d03a 100644
--- a/proceedings/templates/partials/proceedings/summary.html
+++ b/proceedings/templates/partials/proceedings/summary.html
@@ -5,7 +5,7 @@
     </tr>
     <tr>
         <th>Description</th>
-        <td>{{ proceedings.event_description|default:'-'|linebreaksbr }}</td>
+        <td>{{ proceedings.event_description|safe|default:'-'|linebreaksbr }}</td>
     </tr>
     {% if proceedings.event_start_date %}
         <tr>
diff --git a/submissions/static/submissions/latex/SciPost.cls b/submissions/static/submissions/latex/SciPost.cls
index 856575d8a60a67d0b6780b10a68bfad461b96f0a..1c1518ab48166332dc34bc0700516e1e34e2e747 100644
--- a/submissions/static/submissions/latex/SciPost.cls
+++ b/submissions/static/submissions/latex/SciPost.cls
@@ -1,8 +1,8 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{SciPost} % SciPost Latex Template v1a (2016/06/14)
+\ProvidesClass{SciPost} % SciPost Latex Template v1e (2017/10/31)
 
 
-\LoadClass[11pt]{article}
+\LoadClass[11pt,a4paper]{article}
 
 
 % Layout
@@ -28,7 +28,8 @@
 \RequirePackage{doi}
 
 % Math formulas and symbols
-\RequirePackage{amsmath,amssymb}
+%\RequirePackage{amsmath,amssymb} % Redundant (clashes with mathdesign)
+\RequirePackage{amsmath}
 
 % Hyperrefs
 \RequirePackage{hyperref}
@@ -50,11 +51,35 @@
 \RequirePackage{xcolor}
 \definecolor{scipostdeepblue}{HTML}{002B49}
 
+\RequirePackage{graphicx}
+
+\RequirePackage{cite}
+
+%% Patch lineno when used with amsmath
+\newcommand*\patchAmsMathEnvironmentForLineno[1]{%
+\expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname
+\expandafter\let\csname oldend#1\expandafter\endcsname\csname end#1\endcsname
+\renewenvironment{#1}%
+{\linenomath\csname old#1\endcsname}%
+{\csname oldend#1\endcsname\endlinenomath}}%
+\newcommand*\patchBothAmsMathEnvironmentsForLineno[1]{%
+\patchAmsMathEnvironmentForLineno{#1}%
+\patchAmsMathEnvironmentForLineno{#1*}}%
+\AtBeginDocument{%
+\patchBothAmsMathEnvironmentsForLineno{equation}%
+\patchBothAmsMathEnvironmentsForLineno{align}%
+\patchBothAmsMathEnvironmentsForLineno{flalign}%
+\patchBothAmsMathEnvironmentsForLineno{alignat}%
+\patchBothAmsMathEnvironmentsForLineno{gather}%
+\patchBothAmsMathEnvironmentsForLineno{multline}%
+}
+%% End patch lineno
 
+\DeclareOption{Phys}{
 \lhead{
-%  \colorbox{scipostdeepblue}{\strut \bf \color{white} ~Submission }
   \colorbox{scipostdeepblue}{\strut \bf \color{white} ~SciPost Physics }
 }
+}
 
 \DeclareOption{LectureNotes}{
   \lhead{
@@ -63,8 +88,16 @@
 }
 \ProcessOptions\relax
 
-\rhead{
-  \colorbox{scipostdeepblue}{\strut \bf \color{white} ~Submission }
+\DeclareOption{Proceedings}{
+  \lhead{
+    \colorbox{scipostdeepblue}{\strut \bf \color{white} ~SciPost Physics Proceedings }
+  }
 }
+\ProcessOptions\relax
 
-
+\DeclareOption{submission}{
+  \rhead{
+    \colorbox{scipostdeepblue}{\strut \bf \color{white} ~Submission }
+  }
+ }
+\ProcessOptions\relax
diff --git a/submissions/static/submissions/latex/SciPost_Example_BiBTeX_File.bib b/submissions/static/submissions/latex/SciPost_Example_BiBTeX_File.bib
new file mode 100644
index 0000000000000000000000000000000000000000..e68ea35ceae0c73cfe2a143cee880ce0286bfc42
--- /dev/null
+++ b/submissions/static/submissions/latex/SciPost_Example_BiBTeX_File.bib
@@ -0,0 +1,34 @@
+
+
+@Article{1931_Bethe_ZP_71,
+  author =       {H. A. Bethe},
+  title = 	 {Zur {T}heorie der {M}etalle.  I.  {E}igenwerte und {E}igenfunktionen der linearen {A}tomkette},
+  journal = 	 {Zeit. f\"ur Physik},
+  year = 	 {1931},
+  volume = 	 {71},
+  pages = 	 {205},
+  doi = {10.1007/BF01341708}
+}
+
+
+@unpublished{arXiv:1108.2700,
+  author    = {P. Ginsparg},
+  title     = {It was twenty years ago today ...},
+  eprint       = {http://arxiv.org/abs/1108.2700},
+}
+
+
+@Article{2016_Piroli_SP_1,
+  author = 	 {Lorenzo Piroli and Pasquale Calabrese and Fabian H. L. Essler},
+  title = 	 {{Quantum quenches to the attractive one-dimensional Bose gas: exact results}},
+  journal = 	 {SciPost Phys.},
+  year = 	 {2016},
+  OPTkey = 	 {},
+  volume = 	 {1},
+  number = 	 {1},
+  pages = 	 {001},
+  OPTmonth = 	 {},
+  OPTnote = 	 {},
+  OPTannote = 	 {}
+}
+
diff --git a/submissions/static/submissions/latex/SciPost_LaTeX_Style_v1e.tar.gz b/submissions/static/submissions/latex/SciPost_LaTeX_Style_v1e.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..133b5a6ee57ce9d5c9755f675cc2a59951ab02e4
Binary files /dev/null and b/submissions/static/submissions/latex/SciPost_LaTeX_Style_v1e.tar.gz differ
diff --git a/submissions/static/submissions/latex/SciPost_LaTeX_Template.pdf b/submissions/static/submissions/latex/SciPost_LaTeX_Template.pdf
index 601660421b6e147195ce2a3c8d748ed9ca7daff5..52d414fe425be4b20013b8be9123e5363728281c 100644
Binary files a/submissions/static/submissions/latex/SciPost_LaTeX_Template.pdf and b/submissions/static/submissions/latex/SciPost_LaTeX_Template.pdf differ
diff --git a/submissions/static/submissions/latex/SciPost_LaTeX_Template.tex b/submissions/static/submissions/latex/SciPost_LaTeX_Template.tex
index 8e5713cc269b6390f234b87495745cd01a634954..4b042b3d955075637a8eba11c60dca91f4d9d709 100644
--- a/submissions/static/submissions/latex/SciPost_LaTeX_Template.tex
+++ b/submissions/static/submissions/latex/SciPost_LaTeX_Template.tex
@@ -1,6 +1,6 @@
 % =========================================================================
 % SciPost LaTeX template
-% Version 1a (2016/06/14)
+% Version 1e (2017-10-31)
 %
 % Submissions to SciPost Journals should make use of this template.
 %
@@ -11,16 +11,18 @@
 % =========================================================================
 
 
-% TODO: uncommente ONE of the class declarations below
+% TODO: uncomment ONE of the class declarations below
 % If you are submitting a paper to SciPost Physics: uncomment next line
-\documentclass{SciPost}
+\documentclass[submission, Phys]{SciPost}
 % If you are submitting a paper to SciPost Physics Lecture Notes: uncomment next line
-%\documentclass[LectureNotes]{SciPost}
+%\documentclass[submission, LectureNotes]{SciPost}
+% If you are submitting a paper to SciPost Physics Proceedings: uncomment next line
+%\documentclass[submission, Proceedings]{SciPost}
 
 
 \begin{document}
 
-% TODO: write your article's title here. 
+% TODO: write your article's title here.
 % The article title is centered, Large boldface, and should fit in two lines
 \begin{center}{\Large \textbf{
 Article Title, as descriptive as possible, ideally fitting in two lines (approximately 150 characters) or less
@@ -28,20 +30,22 @@ Article Title, as descriptive as possible, ideally fitting in two lines (approxi
 
 % TODO: write the author list here. Use initials + surname format.
 % Separate subsequent authors by a comma, omit comma at the end of the list.
-% Mark the corresponding author with a superscript *. 
+% Mark the corresponding author with a superscript *.
 \begin{center}
-Initials1 Surname1\textsuperscript{1}, 
-A.B. Cee\textsuperscript{2}, 
-Initials3 Surname3\textsuperscript{3*}
+D. E. Faa\textsuperscript{1},
+A. B. Cee\textsuperscript{2},
+G. K. See\textsuperscript{3*}
 \end{center}
 
-% TODO: write all affiliations here. 
+% TODO: write all affiliations here.
 % Format: institute, city, country
 \begin{center}
 {\bf 1} Affiliation1
 \\
 {\bf 2} Affiliation2
 \\
+{\bf 3} Affiliation2
+\\
 % TODO: provide email address of corresponding author
 * CorrespondingAuthor@email.address
 \end{center}
@@ -54,10 +58,10 @@ Initials3 Surname3\textsuperscript{3*}
 %\linenumbers
 
 \section*{Abstract}
-{\bf 
+{\bf
 % TODO: write your abstract here.
 The abstract is in boldface, and should fit in 8 lines.
-It should be written in a clear and accessible style, emphasizing the context, the problem(s) studied, the methods used, the results obtained, the conclusions reached, and the outlook. You can add a table contents, recommended if your paper is more than 6 pages long. 
+It should be written in a clear and accessible style, emphasizing the context, the problem(s) studied, the methods used, the results obtained, the conclusions reached, and the outlook. You can add a table contents, recommended if your paper is more than 6 pages long.
 }
 
 
@@ -80,14 +84,14 @@ The bulk of the paper should be clearly divided into sections with short descrip
 
 
 \section{A Section}
-Use sections to structure your article's presentation. 
+Use sections to structure your article's presentation.
 
 Equations should be centered; multi-line equations should be aligned.
 \begin{equation}
 H = \sum_{j=1}^N \left[J (S^x_j S^x_{j+1} + S^y_j S^y_{j+1} + \Delta S^z_j S^z_{j+1}) - h S^z_j \right].
 \end{equation}
 
-In the list of references, cited papers \cite{1931_Bethe_ZP_71} should include authors, title, journal reference (journal name, volume number (in bold), start page) and most importantly DOI link. For a preprint \cite{arXiv:1108.2700}, please include authors, title (please ensure proper capitalization) and arXiv link. If you use BiBTeX with our style file, the right format will be automatically implemented.
+In the list of references, cited papers \cite{1931_Bethe_ZP_71} should include authors, title, journal reference (journal name, volume number (in bold), start page) and most importantly a DOI link. For a preprint \cite{arXiv:1108.2700}, please include authors, title (please ensure proper capitalization) and arXiv link. If you use BiBTeX with our style file, the right format will be automatically implemented.
 
 All equations and references should be hyperlinked to ensure ease of navigation. This also holds for [sub]sections: readers should be able to easily jump to Section \ref{sec:another}.
 
@@ -105,7 +109,7 @@ Figures should only occupy the stricly necessary space, in any case individually
 You must include a conclusion.
 
 \section*{Acknowledgements}
-Acknowledgements should follow immediately after the conclusion. 
+Acknowledgements should follow immediately after the conclusion.
 
 % TODO: include author contributions
 \paragraph{Author contributions}
@@ -113,7 +117,7 @@ This is optional. If desired, contributions should be succinctly described in a
 
 % TODO: include funding information
 \paragraph{Funding information}
-Authors are required to provide funding information, including relevant agencies and grant numbers with linked author's initials.
+Authors are required to provide funding information, including relevant agencies and grant numbers with linked author's initials. Correctly-provided data will be linked to funders listed in the \href{https://www.crossref.org/services/funder-registry/}{\sf Fundref registry}.
 
 
 \begin{appendix}
@@ -122,7 +126,7 @@ Authors are required to provide funding information, including relevant agencies
 Add material which is better left outside the main text in a series of Appendices labeled by capital letters.
 
 \section{About references}
-Your references should start with the comma-separated author list (initials + last name), the publication title in italics, the journal reference with volume in bold, start page number, publication year in parenthesis, completed by the DOI link (linking must be implemented before publication). If using BiBTeX, please use the style files provided  on \url{https://scipost.org/submissions/author_guidelines}. If you are using our \LaTeX template, simply add 
+Your references should start with the comma-separated author list (initials + last name), the publication title in italics, the journal reference with volume in bold, start page number, publication year in parenthesis, completed by the DOI link (linking must be implemented before publication). If using BiBTeX, please use the style files provided  on \url{https://scipost.org/submissions/author_guidelines}. If you are using our \LaTeX template, simply add
 \begin{verbatim}
 \bibliography{your_bibtex_file}
 \end{verbatim}
@@ -134,7 +138,7 @@ in order to simplify the production of your paper.
 \end{appendix}
 
 
-% TODO: 
+% TODO:
 % Provide your bibliography here. You have two options:
 
 % FIRST OPTION - write your entries here directly, following the example below, including Author(s), Title, Journal Ref. with year in parentheses at the end, followed by the DOI number.
diff --git a/submissions/templates/submissions/author_guidelines.html b/submissions/templates/submissions/author_guidelines.html
index 94ec25ae3149ac5450fb32672b301b0512e26fc6..11428047bd7f81351d88040f9573652fa93e851d 100644
--- a/submissions/templates/submissions/author_guidelines.html
+++ b/submissions/templates/submissions/author_guidelines.html
@@ -30,7 +30,7 @@
   <h2>Manuscript preparation</h2>
 
   <p>We prefer authors to prepare their manuscript using the SciPost LaTeX2e style, which you can download
-    as a <a href="{% static 'submissions/latex/SciPost_LaTeX_Style_v1a.tar.gz' %}">gzipped tarball</a>,
+    as a <a href="{% static 'submissions/latex/SciPost_LaTeX_Style_v1e.tar.gz' %}">gzipped tarball</a>,
     composed of the following individual files:
     <ul>
       <li><a href="{% static 'submissions/latex/SciPost_LaTeX_Template.tex' %}">LaTeX2e template (.tex)</a></li>
diff --git a/submissions/views.py b/submissions/views.py
index a9824dbd660242ffc31f7a9cdc5cdfc44ae7459e..a8d12ce41147f6943d1532d5f21429b55c5bcb8c 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -995,7 +995,7 @@ def cancel_ref_invitation(request, arxiv_identifier_w_vn_nr, invitation_id):
     """
     try:
         submissions = Submission.objects.filter_for_eic(request.user)
-        invitation = submissions.referee_invitations.get(pk=invitation_id)
+        invitation = RefereeInvitation.objects.get(submission__in=submissions, pk=invitation_id)
     except RefereeInvitation.DoesNotExist:
         raise Http404