diff --git a/NEWPROPOSAL/FULLPROP.tex b/NEWPROPOSAL/FULLPROP.tex
index b176c5df159edb31e9459c37f2e2e7fa434b4d19..5957fcded6b24e6d0e52ab160a6c79d665abfeda 100644
--- a/NEWPROPOSAL/FULLPROP.tex
+++ b/NEWPROPOSAL/FULLPROP.tex
@@ -163,7 +163,7 @@ Describe the specific objectives of the project, which should be clear, measurab
   This consists of techniques for a compiler to translate high-level specifications of quantum programs, to operations on a variety of hardware platforms, automatically managing resources and architectural constraints in doing so.
   This allows the software stack to be developed and organised in a modular fashion for multiple platforms, and then compiled in an intelligently managed way to make the most of quantum hardware resources.
 
-\TODOb{Summary/context should contain a clear statement that NOW zx does better (i.e. "outperforms") than anything else for circuit simplification using PyZX.  This should be explained in even more detail elsewhere.  This is the strongest case for getting the money!}
+\TODOb{Summary/context should contain a clear statement that NOW zx does better (i.e. "outperforms") than anything else for circuit simplification using PyZX.  This should be explained in even more detail elsewhere.  Aleks maybe?}
 \paragraph{Context:}
 \label{sec:context}  
 
@@ -1148,9 +1148,9 @@ early outputs of each WP will be used in later outputs of other WPs.
   
   \caption{Approximate timings and durations of tasks (months)}
 \label{fig:gantt}
-\end{figure}
+\end{figure}}
 
-The project is a single integrated whole, so there are many linkages
+\oldt{The project is a single integrated whole, so there are many linkages
 between the work packages; these are displayed in
 Figure~\ref{fig:pert}. As discussed in
 \S~\ref{sec:manag-struct-milest}, only some of these linkages are true
@@ -1158,7 +1158,7 @@ dependencies, where later tasks rely on results of earlier ones. On the other ha
 
 Our work plan consists of a balance of short tasks with concrete software deliverables (e.g. \ref{task:transQASM} and \ref{task:HPC-sim-model}) and longer term, more ambitious and open-ended tasks (e.g. \ref{task:algorithms} and \ref{task:opt-machine}) which can offer significant, but less predictable, step-changes in the state of the art.
 
-Except for \ref{task:transQASM}, the tasks of \ref{wp:frontend} are
+Except for \ref{task:transQASM}, the tasks of \ref{wp:frontend} are 
 long and thin. That is, they are intended to work in parallel with the other WPs, with new features being integrated as they are developed.
 
 The early tasks of \ref{wp:frontend} and \ref{wp:backends} are quite
@@ -1173,9 +1173,9 @@ The more challenging machine models of \ref{task:delft-model} and
 %  delayed until sufficient theory has been
 % developed to attempt them.
 
-\ref{wp:usefulstuff} requires integrating and generalising many of the
+\ref{wp:usefulstuff} requires integrating and generalising many of the 
 ideas of \ref{wp:backends} and \ref{wp:theory}, so it is mostly
-scheduled toward the end of the project.
+scheduled toward the end of the project.}
 
 \begin{figure}[h]
   \centering
@@ -1191,7 +1191,6 @@ However, because of the integrated nature of the project, and the high
 degree of past collaboration among the consortium members, most tasks
 receive attention from the personnel of several sites.  This degree of
 collaboration is a strong point of this project.
-}
 
 \newpage
 
@@ -1320,36 +1319,36 @@ Devise test-suite of concrete instances of circuits and
 %%%
 \begin{WP}{Representation, reasoning, and resources in \zx}{1M}{36M}{wp:backends}
 \WPleaderPOL
-\WPeffort{\newt{12}}{\newt{12}}{\newt{14}}{\newt{4}}{\newt{30}}{\newt{6}}
+\WPeffort{{12}}{{12}}{{14}}{{4}}{{30}}{{6}}
 \begin{WPaim}
 %We build the theoretical foundations for \zx as an intermediate representation. This includes extending the capabilities of \zx to represent mixed states, qudit states, and control flows. We use \zx axiomatisations and automated theorem provers to extract out post-classical computing resources, which will be used both for further optimisation work, and for characterisation of quantum algorithmic speed-up.
 We build the theoretical foundations for \zx as an intermediate representation. This includes extending the capabilities of \zx to represent qudit states with a fixed $d$, arbitrary finite-dimensional quantum states, and control flows. We explore the structure of W-type tensors with interaction with \zx generators of GHZ-type. We use \zx axiomatisations and automated theorem provers to extract out post-classical computing resources, which will be used both for further optimisation work, and for characterisation of quantum algorithmic speed-up.
 \end{WPaim}
 \begin{WPtasks} 
     \WPtask[\label{task:axioms}]{Beyond qubits and stabilisers 
-   \newt{   (M1--M14; Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:loria},\partnerref{partner:gdansk})}}{%
+   {   (M1--M14; Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:loria},\partnerref{partner:gdansk})}}{%
     %We will exploit further the recent completeness results to give representations for mixed state qubit quantum theory. We will
     %extend the \textsc{zx} tensor formalism from the qubit domain to higher dimensions.
     We will extend the completeness results of the \textsc{zx}-calculus from the qubit domain to higher dimensions, to have complete qudit \textsc{zx}-calculus. Furthermore, we will combine all the qudit \textsc{zx}-calculus into a single framework so that we can deal with the whole finite-dimensional quantum theory in a \textsc{zx} style. In addition, we will exploit techniques from the \textsc{zw}-calculus to understand the deep structure of  W-type tensors.        
     % and exploit the translation from \textsc{zx}-    to \textsc{zw}-calculus.
     }
   \WPtask[\label{task:betterboxes}]{Control in \zx
-    \newt{  \ (M1--M18; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
+    {  \ (M1--M18; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
    % Support simple control flow at the level of \azx, making it a more suitable target for compiling from a high-level language. In particular, add support for repetition and recursive definitions of diagrams, e.g. for expressing and transforming regular families of circuits. 
    We will use parametric \zx terms to support simple control flow at the level of the \dzxc system, making it a more suitable target for compiling from a high-level language. In particular, we will add support for repetition and recursive definitions of diagrams, e.g. for expressing and transforming regular families of circuits. 
   }
       \WPtask[\label{task:resources}]{Resources and axioms
-   \newt{ (M1--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
+   { (M1--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
 We will exploit the three axiom sets for Clifford, Clifford+T, and universal qubit QM,
 to identify and distill specific resources that are necessary to quantum speed-up. In particular, to focus on finding multiple resource elements (rather than simply magic states), and to characterise post-classical composition as a resource.
 This includes developing \zx representations of contextuality, as a possible post-classical resource.
     }
           \WPtask[\label{task:resourcesagain}]{Computational resources
-  \newt{  (M12--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:radboud})}}{%
+  {  (M12--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:radboud})}}{%
 We will use the existing graph re-writing and automated theorem proving tools of Quantomatic and PyZX to determine parts of the re-writing process that are difficult to compute classically. This will then be used to extract candidate subroutines for sources of quantum speed-up. Along with the previous task, these will be used to develop procedures for characterising if a \zx-represented algorithm demonstrates speed-up or not.
     }
  
-\end{WPtasks}
+\end{WPtasks} 
 \begin{WPdeliverables}
   \WPdeliverable{M9}{Preliminary assessment of the comparative study of the axiomatizations of paradigms of quantum computation} 
    \WPdeliverable{M14}{Completeness  of qudit \zx calculus} 
@@ -1369,7 +1368,7 @@ We will use the existing graph re-writing and automated theorem proving tools of
 %%%
 \begin{WP}{Machine-independent optimisation}{M1}{M36}{wp:theory}
   \WPleaderOXF
-  \WPeffort{\newt{12}}{\newt{9}}{\newt{30}}{\newt{12}}{\newt{12}}{\newt{12}}
+  \WPeffort{{12}}{{9}}{{30}}{{12}}{{12}}{{12}}
   \begin{WPaim}
 We develop practical logical and algorithmic techniques for transforming  ``abstract'' \zx terms produced from a high-level program in ways
     which will be required by any practical compiler, and reasoning about their properties. Examples include:
@@ -1379,7 +1378,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
   \end{WPaim}
   \begin{WPtasks}
     \WPtask[\label{task:algorithms}]{Reduction strategies, algorithms,
-      and complexity (M1--M24; \newt{Responsible: \partnerref{partner:radboud}; Involved: \partnerref{partner:loria}, \partnerref{partner:oxford}, \partnerref{partner:CQC}})}{%
+      and complexity (M1--M24; {Responsible: \partnerref{partner:radboud}; Involved: \partnerref{partner:loria}, \partnerref{partner:oxford}, \partnerref{partner:CQC}})}{%
       Develop new strategies for simplifying \textsc{zx}-style tensor
       networks and reducing to (pseudo) normal forms, with the help of
       automated techniques such as Knuth-Bendix completion and
@@ -1388,14 +1387,14 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
     }
 
     \WPtask[\label{task:annotate1}]{Topological and causal constraints 
-      (M1--M18; \newt{Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:loria}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{%
+      (M1--M18; {Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:loria}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{%
       Extend \dzxc language and tools to express and enforce: (1) topological
       constaints, such as nearest-neighbour connectivity of qubits and
       (2) causal/temporal constraints, such as sequential ordering of
       measurements and classically-controlled operations.
     }
     \WPtask[\label{task:annotate2}]{Quantitative Properties (M13--M24; 
-      \newt{Responsible: \partnerref{partner:CQC}; Involved: \partnerref{partner:oxford}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{%
+      {Responsible: \partnerref{partner:CQC}; Involved: \partnerref{partner:oxford}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{%
       Extend \dzxc language and tools to account for several kinds of
       numerical annotations, e.g.~timing data related to performing
       operations, gate fidelities, channel fidelities, and decoherence
@@ -1405,7 +1404,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
       quantities from local to global properties.  
     }
         \WPtask[\label{task:basic-opt}]{Generic optimisations of ZX-terms 
-      (M12--M24; \newt{Responsible: \partnerref{partner:oxford};   Involved: \partnerref{partner:loria}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{% 
+      (M12--M24; {Responsible: \partnerref{partner:oxford};   Involved: \partnerref{partner:loria}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{% 
       Use the results of task~\ref{task:algorithms} to develop
       procedures to optimise \zx-terms, in a way which is applicable
       for families of circuits (e.g.~Clifford, Clifford+T, CNOT+T,
@@ -1417,7 +1416,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
       }
 %%
       \WPtask[\label{task:ECC}]{Application of Error-Correction
-        (M1--M24; \newt{Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:grenoble}, \partnerref{partner:gdansk}})}{%
+        (M1--M24; {Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:grenoble}, \partnerref{partner:gdansk}})}{%
         Develop algorithms which rewrite abstract tensor networks to
         equivalent tensors in codeword space of a chosen
         error-correcting code.  This may be combined with additional
@@ -1458,7 +1457,7 @@ Perdrix, Valiron, Carette.}
 %%%
 \begin{WP}{Machine-dependent optimisation}{1M}{36M}{wp:usefulstuff}
   \WPleaderGREN
-  \WPeffort{12}{9}{12}{6}{\newt{6}}{0}
+  \WPeffort{12}{9}{12}{6}{6}{0}
   \begin{WPaim}
 We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon spin qubits developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be \ldots.
 Also machine-dependent error correction here?
@@ -1518,7 +1517,7 @@ Staton, Carette.}
 
 \begin{WP}{Administation and Communications}{M1}{M36}{wp:admin} 
   \WPleaderGREN
-  \WPeffort{3}{3}{2}{1}{\newt{4}}{0}
+  \WPeffort{3}{3}{2}{1}{4}{0}
   \begin{WPaim}
     This work package collects general administrative activities and
     the organisation of the project meetings.  All meetings will be
@@ -1622,9 +1621,9 @@ Each work package will be lead by a responsible PI who will coordinate
 research activity between sites to ensure that deliverables are met,
 achieve WP-specific objectives, and organise collaboration meetings as
 needed.  
-\textbf{\ref{wp:frontend}}: \newt{S. Perdrix (LORIA)}, 
+\textbf{\ref{wp:frontend}}: S. Perdrix (LORIA), 
 \textbf{\ref{wp:backends}}: A. B. Sainz (Gdansk),
-\textbf{\ref{wp:theory}}: \newt{B. Coecke (Oxford)},
+\textbf{\ref{wp:theory}}: B. Coecke (Oxford),
 \textbf{\ref{wp:usefulstuff}}: D. Horsman (Grenoble),
 \textbf{\ref{wp:admin}}: D. Horsman (Grenoble).