diff --git a/astron-texmf b/astron-texmf
index 477d155500a1dcdf5bb114e21c541960dd27494d..3141cf803b6961491167b1c43803c51db9988cf7 160000
--- a/astron-texmf
+++ b/astron-texmf
@@ -1 +1 @@
-Subproject commit 477d155500a1dcdf5bb114e21c541960dd27494d
+Subproject commit 3141cf803b6961491167b1c43803c51db9988cf7
diff --git a/contents/1-intro.tex b/contents/1-intro.tex
index dbd2681e460d63dd87cae65f9f593d78bf376926..2293cb30fc082ed4a4d3a919a74a11247847281c 100644
--- a/contents/1-intro.tex
+++ b/contents/1-intro.tex
@@ -30,7 +30,7 @@ Specifically, we will consider:
 
 Broadly, this report is structured in two parts.
 In the first part, we provide essential context by describing the \pgls{ESAP} system.
-In \cref{sec:vision} we the overall vision for the \pgls{ESAP} system: what did we set out to build?
+In \cref{sec:vision} we the address the overall vision for the \pgls{ESAP} system: what did we set out to build?
 \Cref{sec:delivered} takes that further by describing what is currently available: if one were to deploy and operate an \pgls{ESAP} system today, what would it consist of?
 
 The second part of this document moves on to asses how successful that vision and implementation have been in addressing user --- and in particular \gls{ESFRI} --- needs.
diff --git a/contents/2-vision.tex b/contents/2-vision.tex
index c1461575fb79270ff3db82d4baf0123ef452500f..2ecca2d944a7a18e6df5f0bdb6201ddfd9c9fcd9 100644
--- a/contents/2-vision.tex
+++ b/contents/2-vision.tex
@@ -3,7 +3,7 @@
 
 This section presents a brief overview of the vision for and design of \pgls{ESAP}.
 It supplements and expands upon earlier discussions \cite{ESCAPE-GA, ESCAPE-D5.2, ESCAPE-D5.3} to describe current thinking about how \pgls{ESAP} can best meet its goals.
-The vision is inspired by and aims to address a wide rage of \glspl{ESFRI} use cases that have been expressed by the project partners through the \gls{ESCAPE} Project Platform.\footnote{\url{https://project.escape2020.de}}
+The vision is inspired by and aims to address a wide range of \glspl{ESFRI} use cases that have been expressed by the project partners through the \gls{ESCAPE} Project Platform.\footnote{\url{https://project.escape2020.de}}
 Note that not all of the capabilities described in this section are currently available in the \pgls{ESAP} codebase: see \cref{sec:delivered} for a description of the current state of the art, and \cref{sec:future} for future development plans.
 
 \subsection{High-Level Summary}
@@ -124,7 +124,7 @@ Users may be asked to log in to access \pgls{ESAP} itself, or to use some or all
 This step is not required: if both the owner of the \pgls{ESAP} instance and the owner of any services being accessed make them available to the general public, then \pgls{ESAP} need not force the user to log in.
 In general, however, users are expected to log in before using the data orchestration services (\cref{sec:vision:capabilities:orch}).
 
-\pgls{ESAP} as delivered by this work package is designed to support authentication through any \gls{OIDC}-compliant system, although it has only been extensively tested and integrated with the \gls{ESCAPE} \gls{IAM} service\footnote{\url{https://iam-escape.cloud.cnaf.infn.it/login}}.
+\pgls{ESAP} as delivered by this work package is designed to support authentication through any \gls{OIDC}-compliant system, although it has only been extensively tested and integrated with the \gls{ESCAPE} \gls{IAM} service.\footnote{\url{https://iam-escape.cloud.cnaf.infn.it/login}; \url{https://indigo-iam.github.io/v/v1.8.0/docs/overview}}
 
 \subsubsection{Data Orchestration within \glsentrytext{ESAP}}
 \label{sec:vision:capabilities:orch}
@@ -220,7 +220,7 @@ That is, based on metadata sourced from the \gls{OSSR}, \pgls{ESAP} helps the us
 \subsubsection{Managed Database}
 \label{sec:vision:capabilities:db}
 
-A managed database service provides users with with the capability to define and use their own relational databases directly within the \gls{ESAP} system.
+A managed database service provides users with the capability to define and use their own relational databases directly within the \gls{ESAP} system.
 It is possible to directly load the results of queries against external archives into the user's database space, and then to submit complex \gls{SQL} queries to the database system.
 This provides the user with advanced data analysis capabilities --- for example, the ability to perform complex catalogue cross-matching --- without requiring that they set up and administer their own database system.
 Further, it opens the prospect of integrating \pgls{ESAP} with external \gls{SQL} federation services such as Trino\footnote{\url{https://trino.io}} or openLooKeng\footnote{\url{https://openlookeng.io}}.
diff --git a/contents/3-delivered.tex b/contents/3-delivered.tex
index 11bb93aeedab5f66f51c50d9d742e224d9afb4b3..5c5c6896fb34125169a7b526245267ae4fe682d5 100644
--- a/contents/3-delivered.tex
+++ b/contents/3-delivered.tex
@@ -29,7 +29,7 @@ The interface is a cross-platform web application implemented in React\footnote{
 \label{sec:delivered:gateway}
 
 As discussed in \cref{sec:vision:capabilities:ui}, the “API Gateway” provides back-end capabilities for the \pgls{ESAP} system.
-The API Gateway is written in Python, using using Django\footnote{\url{https://www.djangoproject.com/}} and its companion \gls{REST} framework\footnote{\url{https://www.django-rest-framework.org/}}.
+The API Gateway is written in Python, using Django\footnote{\url{https://www.djangoproject.com/}} and its companion \gls{REST} framework\footnote{\url{https://www.django-rest-framework.org/}}.
 
 The API Gateway provides a rich, plugin-based system for adding new service integrations to \gls{ESAP}.
 It also provides an asynchronous job control system, shown in \cref{fig:esap:async}, which is used to manage long-running tasks like some queries (\cref{sec:delivered:data}) and batch processing jobs (\cref{sec:delivered:batch}).
diff --git a/contents/5-esfri.tex b/contents/5-esfri.tex
index 5731a42b187e46afe035fdf7d49e62781350788f..3e69d38338890b987cf171e84f767fd4b6d704d4 100644
--- a/contents/5-esfri.tex
+++ b/contents/5-esfri.tex
@@ -54,7 +54,7 @@ The project has already put this into practice, for example by linking \pgls{ESA
 
 \paragraph{Analysis Workflows}
 
-The \gls{CTAO} Science Portal will offer data and services to users its users and staff, with the aim of enabling user interaction with data products and cross-collaboration and joint analysis of data products.
+The \gls{CTAO} Science Portal will offer data and services to its users and staff, with the aim of enabling user interaction with data products and cross-collaboration and joint analysis of data products.
 These workflows will build upon new and existing tools, including:
 
 \begin{description}
diff --git a/contents/6-future.tex b/contents/6-future.tex
index 3e3369fab17a3d4c9b157f485e3274e3b8a8cff9..31cb238efbcdcac4ebf2c680d7ad36d5f8225ffa 100644
--- a/contents/6-future.tex
+++ b/contents/6-future.tex
@@ -19,7 +19,7 @@ The engagement of research infrastructures and other facilities with \gls{ESAP}
 
 In the first, major infrastructures --- such as \gls{SKAO} and \gls{CTAO}, as described in \cref{sec:esfri} --- see \gls{ESAP} as a toolkit or library of potentially reusable components.
 For example, the distributed and extraordinarily data-intensive nature of the SKA Regional Centres Network means that \gls{ESAP} cannot simply be deployed in its current form: that environment is more complex and specialized than even a tool as generic as \gls{ESAP} can address without modification.
-However, it is likely that that the Regional Centres effort will build on existing libraries and toolkits --- like \pgls{ESAP} --- to realise its goals (although we note that multiple technologies are under consideration, and the use of \pgls{ESAP}-derived code is not certain).
+However, it is likely that the Regional Centres effort will build on existing libraries and toolkits --- like \pgls{ESAP} --- to realise its goals (although we note that multiple technologies are under consideration, and the use of \pgls{ESAP}-derived code is not certain).
 A similar story applies to other major research infrastructures, certainly including \gls{CTAO}, but also perhaps \gls{ESO}, \gls{JIVE}, and other research infrastructures both within \gls{ESCAPE} and across the wider scientific ecosystem.
 
 A second community of potential users are those research infrastructures which have less exacting needs, and instead are looking for a “plug and play” solution that they can use to rapidly provide functionality to their user community: rather than seeing \gls{ESAP} as components upon which they might build, they look to \gls{ESAP} to provide a ready-to-use solution that can be deployed with minimal modification.
diff --git a/contents/8-conclusions.tex b/contents/8-conclusions.tex
index 41e73741f7c45bec009edbe35eebf804b77a3ae2..8dd9dab43b0e9d2f7324cd00f075850cae92092c 100644
--- a/contents/8-conclusions.tex
+++ b/contents/8-conclusions.tex
@@ -12,4 +12,4 @@ However, it also presents an opportunity to go further: the \gls{ESAP} system pr
 Therefore, in \cref{sec:future} we described potential approaches to future work, both in terms of the organization of the project and the technical challenges which could be addressed.
 
 The conclusion of the \gls{ESCAPE} project marks the release of the first stable version of \gls{ESAP}, which may be accessed as described in \cref{sec:access}.
-However, we are optimistic that the system will continue to grown and evolve into the future.
+However, we are optimistic that the system will continue to grown and evolve into the future, and we look forward to future funding opportunities which might support that evolution.
diff --git a/contents/summary.tex b/contents/summary.tex
index 0cc2ab6652760b7457ff691ea790c43b48803b1c..cae0bb54eab676500b88a321aa9b15f3ef0b2d03 100644
--- a/contents/summary.tex
+++ b/contents/summary.tex
@@ -18,6 +18,6 @@ Over the course of the \Acrshort{ESCAPE} Project, \Acrshort{ESAP} has grown from
 Based on the material presented here, we conclude that \Acrshort{ESAP} has broadly achieved the goals that were set out at the beginning of the \Acrshort{ESCAPE} project, and is starting to see uptake in the \Acrshort{ESFRI} community.
 
 It has also become clear that much of its potential remains to be tapped: major \Acrshort{ESFRI}s can build upon the systems delivered by \Acrshort{ESCAPE} to address the extreme requirements of the next generation of data- and compute-intensive infrastructures.
-We look forward to seeing \Acrshort{ESAP} continue to grow as an open-source project even as the Horizon 2020 funding draws to a close.
+We look forward to seeing \Acrshort{ESAP} continue to grow as an open-source project even as the Horizon 2020 funding draws to a close, and we will continue to seek appropriate funding opportunities to support that effort.
 
 This document is submitted as \Acrshort{ESCAPE} project deliverable \docNumber{}, \emph{\docTitle{}}.
diff --git a/figures b/figures
index 802b1a1c12201d1e6573de0af2a40e08329a410c..2ccbbc617af57f6470780e853c673c169df8ea31 160000
--- a/figures
+++ b/figures
@@ -1 +1 @@
-Subproject commit 802b1a1c12201d1e6573de0af2a40e08329a410c
+Subproject commit 2ccbbc617af57f6470780e853c673c169df8ea31
diff --git a/main.tex b/main.tex
index cc33f49102c41cc836e68d548c9f1b5f5ff2abec..147d776f9340e641808c24d1d3391a1f37a3e830 100644
--- a/main.tex
+++ b/main.tex
@@ -9,7 +9,7 @@
 \setDocTitle{Final Assessment of the Performance of the Science Platform Prototype}
 \setWorkPackage{WP5, ESFRI Science Analysis Platform}
 \setLeadAuthor{John D. Swinbank (ASTRON)}
-\setOtherAuthors{James Collinson (SKAO), Gareth Hughes (CTAO), Stelios Voutsinas (U.~Edinburgh)}
+\setOtherAuthors{Sara Bertocco (INAF), James Collinson (SKAO), Gareth Hughes (CTAO), Stelios Voutsinas (U.~Edinburgh)}
 \setDueDate{2022-11-30}
 \setDueMonth{M46}