diff --git a/02-incns-solver/incns-solver.ipynb b/02-incns-solver/incns-solver.ipynb
index da41adb1a78dbe1f0eb52e906d0b1b9b0429e37a..cd05640459541c532af14614329aeacc3ecbe1ac 100644
--- a/02-incns-solver/incns-solver.ipynb
+++ b/02-incns-solver/incns-solver.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "id": "214d1e5a",
+   "id": "0b018ab6",
    "metadata": {},
    "source": [
     "# **Incompressible Flow Simulation**"
@@ -10,7 +10,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "fb7db30b",
+   "id": "98e5cc81",
    "metadata": {},
    "source": [
     "## Learning objectives <a id='learningObjectives'></a>\n",
@@ -28,7 +28,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "d4e7482f",
+   "id": "348ebe82",
    "metadata": {},
    "source": [
     "# Introduction <a id='introduction'></a>\n",
@@ -38,7 +38,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "cb5727a3",
+   "id": "5ee722c7",
    "metadata": {},
    "source": [
     "## Governing equation <a id='geqn' ></a>\n",
@@ -58,7 +58,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "beb687a7",
+   "id": "eebfd817",
    "metadata": {},
    "source": [
     "# Problem description: 2D case  <a id='pdes' ></a>\n",
@@ -96,7 +96,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "ada34927",
+   "id": "b81b944e",
    "metadata": {},
    "source": [
     "# Pre-processing <a id='preprocessing'></a>\n",
@@ -108,7 +108,7 @@
     "\n",
     "<div class=\"alert alert-info\">\n",
     "\n",
-    "**Note:** It is also possible to use a single xml file instead of two. In that case, one needs to copy the `<GEOMETRY>` tag from the geometry XML file into the session (condition) XML file to make a single XML file.\n",
+    "**Note:** It is also possible to use a single xml file instead of two. In that case, one needs to copy the <code>Geometry</code> tag from the geometry XML file into the session (condition) XML file to make a single XML file.\n",
     "\n",
     "</div>\n",
     "\n",
@@ -132,7 +132,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "4f4354ed",
+   "id": "f9bc0470",
    "metadata": {},
    "source": [
     "## Expansion bases <a id='expansionBases'></a>\n",
@@ -156,7 +156,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "7226e6fd",
+   "id": "2d35a8c7",
    "metadata": {},
    "source": [
     "## Conditions setup <a id='conditionsSetup'></a>\n",
@@ -172,7 +172,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "9d8567dd",
+   "id": "41931951",
    "metadata": {},
    "source": [
     "### Solver info <a id='solverInfo'></a>\n",
@@ -199,7 +199,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "0d9a2a43",
+   "id": "29d8bcc8",
    "metadata": {},
    "source": [
     "### Parameters  <a id='parameters'></a>\n",
@@ -223,7 +223,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c21edca9",
+   "id": "ba2a0976",
    "metadata": {},
    "source": [
     "### Variables  <a id='variables'></a>\n",
@@ -238,7 +238,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "8e2cbe01",
+   "id": "c50dbd5a",
    "metadata": {},
    "source": [
     "### Boundary conditions  <a id='bc'></a>\n",
@@ -267,7 +267,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "34a4461e",
+   "id": "2f397f7d",
    "metadata": {},
    "source": [
     "### Initial conditions  <a id='ic'></a>\n",
@@ -284,7 +284,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1e9e49b0",
+   "id": "510769ee",
    "metadata": {},
    "source": [
     "## Special parameters for solution stabilisation \n",
@@ -294,7 +294,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "65e2fb26",
+   "id": "4e91dd3b",
    "metadata": {},
    "source": [
     "### Spectral vanishing viscosity\n",
@@ -313,7 +313,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "df160715",
+   "id": "8bccf39f",
    "metadata": {},
    "source": [
     "### Spectral dealiasing\n",
@@ -325,7 +325,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "917620df",
+   "id": "eee0421c",
    "metadata": {},
    "source": [
     "## Filter setup<a id='filtersSetup'></a>\n",
@@ -338,7 +338,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f6b3f655",
+   "id": "f18949ad",
    "metadata": {},
    "source": [
     "### AeroForces filter <a id='aeroForces'></a>\n",
@@ -359,7 +359,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1adb2f72",
+   "id": "cdca0c97",
    "metadata": {},
    "source": [
     "# Running the solver <a id='basic_runningSolver'></a>\n",
@@ -388,7 +388,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "122b67e9",
+   "id": "86733406",
    "metadata": {
     "scrolled": true
    },
@@ -399,7 +399,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "92cc59b2",
+   "id": "1d82a467",
    "metadata": {},
    "source": [
     "# Post-processing"
@@ -407,7 +407,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "31e7f047",
+   "id": "426e6b7b",
    "metadata": {},
    "source": [
     "## Post-processing the flow field<a id='post_filters'></a>\n",
@@ -419,7 +419,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9af97b18",
+   "id": "9819a13a",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -428,7 +428,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "2540fadd",
+   "id": "99fd2bf5",
    "metadata": {},
    "source": [
     "<div class=\"alert alert-info\">\n",
@@ -446,7 +446,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "8525713d",
+   "id": "a1f6966a",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 11:   </b> </span> `Run` the following `python` script which uses  `pyvista` combined with `itkwidgets` to visualise the flowfield in-browser."
@@ -455,7 +455,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "cd89c851",
+   "id": "91674843",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -472,7 +472,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "27b61c94",
+   "id": "1ce8863d",
    "metadata": {},
    "source": [
     "## Post-processing the Filter <a id='post_filters'></a>\n",
@@ -483,7 +483,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "78ae382b",
+   "id": "4066e97a",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -504,7 +504,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "529d617e",
+   "id": "8a7bf34b",
    "metadata": {},
    "source": [
     "## **Calculating the  pressure coefficient**\n",
@@ -524,7 +524,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "8f2716fe",
+   "id": "dfcf299d",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -533,7 +533,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c81b935f",
+   "id": "e2e89f0f",
    "metadata": {},
    "source": [
     "Here the option `surf` uses the wall surface composite number defined as 5,6,7,8 in the `<BOUNDARYREGIONS>`. \n",
@@ -544,7 +544,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "72fbee70",
+   "id": "7676adab",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -553,7 +553,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "afb2fea1",
+   "id": "cc9c5d5a",
    "metadata": {},
    "source": [
     "which will produce a `outFieldData_b0.fld` file containing the field data over the cylinder wall. The option `bnd` specifies the wall boundary ID defined as 0 in the `<BOUNDARYREGIONS>`. \n",
@@ -564,7 +564,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "620a4dab",
+   "id": "f9c725e3",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -573,7 +573,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "30f06489",
+   "id": "ed2699ed",
    "metadata": {},
    "source": [
     "Further processing is required in visualising software to calculate the pressure coefficient. On the other hand, one can use the following simple procedure and utilise a simple Python script as shown below. \n",
@@ -586,7 +586,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "4b351df8",
+   "id": "25b98464",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -595,7 +595,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "98d97059",
+   "id": "8584dc89",
    "metadata": {},
    "source": [
     "The output file `cylWall.dat` contains the variables $x,y,u,v,p$ in each column. The following Python script can be used to plot the pressure over the boundary and calculate the pressure coefficient $C_p$."
@@ -604,7 +604,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "92a1def3",
+   "id": "1d1c1986",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -639,7 +639,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "549a174f",
+   "id": "22239b53",
    "metadata": {},
    "source": [
     "## Animate the flow field\n",
@@ -649,7 +649,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "id": "6db8dd37",
+   "id": "0564990e",
    "metadata": {},
    "outputs": [
     {
@@ -686,7 +686,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c5ed52c1",
+   "id": "fc3f7d45",
    "metadata": {},
    "source": [
     "Now that we have obtained the converted vtu files, one can visulaize the evolution of `u`-velocity field with respect to time using the following script.\n",
@@ -701,7 +701,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "6b1ca730",
+   "id": "e64f3d43",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -727,7 +727,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "a87f3de3",
+   "id": "92487626",
    "metadata": {},
    "source": [
     "## Optional additional tasks   <a id='selfpracticeTasks'> </a>\n",
@@ -762,7 +762,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f15de96a",
+   "id": "aa51c8a1",
    "metadata": {},
    "source": [
     "# Quasi-3D case\n",
@@ -778,7 +778,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "5b4a42df",
+   "id": "0244b007",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 13:   </b> </span> Let us open the condition file [**session3d.xml**](session3d.xml), and complete the `<EXPANSIONS>` tag to run a simulation at order $P=2$. A completed version should have the following form:\n",
@@ -792,7 +792,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1a58e92c",
+   "id": "d801ab9b",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 14:   </b> </span> In the `<SOLVERINFO>` tag, we use the same solver properties as discussed in the 2D case tutorial. Now, add the following two extra lines for the simulation of a quasi-3D case, \n",
@@ -809,7 +809,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "63064e64",
+   "id": "5a534086",
    "metadata": {},
    "source": [
     " <span style=\"color:Chocolate\"><b> Task 15:   </b> </span> In `<PARAMETERS>` tag, add the following extra parameters needed for a quasi-3D case   \n",
@@ -825,7 +825,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "d4e4880a",
+   "id": "020ddbe1",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 16:   </b> </span>\n",
@@ -842,7 +842,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "a673800f",
+   "id": "5a528b62",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 17:   </b> </span> In `<BOUNDARYCONDITIONS>` tag, add boundary conditions for $w$-velocity for each boundary region as $w$=0. \n",
@@ -851,7 +851,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "a8af74b4",
+   "id": "d8b74712",
    "metadata": {},
    "source": [
     "<span style=\"color:Chocolate\"><b> Task 18:   </b> </span> In `InitialConditions` function, provide the initial condition for the $w$ component of velocity as\n",
@@ -873,7 +873,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "6157e3e1",
+   "id": "c3c3cb9f",
    "metadata": {},
    "source": [
     "## Solution stabilisation parameters\n",
@@ -890,7 +890,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "172d090c",
+   "id": "eccdfe19",
    "metadata": {},
    "source": [
     "##  ModalEnergy filter setup\n",
@@ -913,7 +913,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "3cca6892",
+   "id": "e4e9b3ef",
    "metadata": {},
    "source": [
     "## Running the solver in serial \n",
@@ -934,7 +934,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "ee7855ac",
+   "id": "f4801fc8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -943,7 +943,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1bb2ac3d",
+   "id": "edb8c19f",
    "metadata": {},
    "source": [
     "## Post-processing the flow field<a id='post_filters'></a>\n",
@@ -954,7 +954,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "2b78faf2",
+   "id": "09deeff9",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -964,7 +964,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a2a4a6c1",
+   "id": "1d58152d",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -981,7 +981,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "86c70f79",
+   "id": "51c53571",
    "metadata": {},
    "source": [
     "### Q-criterion\n",
@@ -992,7 +992,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "6c10e1ec",
+   "id": "c5c3d530",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1001,7 +1001,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f6d7c7a4",
+   "id": "480afc0f",
    "metadata": {},
    "source": [
     "The generated`cyl3DMesh-Qcrit.fld` file can easily be visualised using `Task 20`."
@@ -1009,7 +1009,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f964b265",
+   "id": "03c595df",
    "metadata": {},
    "source": [
     "### Extract the mean-mode in Fourier space\n",
@@ -1019,7 +1019,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "d7770bbc",
+   "id": "ef5fe801",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1028,7 +1028,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c531e19f",
+   "id": "3c37d264",
    "metadata": {},
    "source": [
     "The generated`cyl3DMesh-meanmode.fld` file can easily be visualised using `Task 20`."
@@ -1036,7 +1036,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c131c960",
+   "id": "cf1dc168",
    "metadata": {},
    "source": [
     "## Post-processing ModalEnergy filter \n",
@@ -1046,7 +1046,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "1d04d276",
+   "id": "a240ff94",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1087,7 +1087,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f059909f",
+   "id": "bbf9c019",
    "metadata": {},
    "source": [
     "## Parallel run  \n",
@@ -1122,7 +1122,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "870b3f54",
+   "id": "31e67ace",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1131,7 +1131,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "02038429",
+   "id": "561d10c7",
    "metadata": {},
    "source": [
     "## Extra tasks  \n",
@@ -1145,7 +1145,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "928dcc78",
+   "id": "600d144e",
    "metadata": {},
    "source": [
     "# Take-a-ways   <a id='takeaways'> </a>\n",
@@ -1158,7 +1158,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "5dff8d55",
+   "id": "0f76e9c4",
    "metadata": {},
    "source": [
     "# References   <a id='references'> </a>\n",
@@ -1170,7 +1170,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c3b6f258",
+   "id": "3027a7c1",
    "metadata": {},
    "source": [
     "## End of the tutorial. "