Index: For_developers/Sphinx/source/Developers/gen_docu.rst
===================================================================
--- For_developers/Sphinx/source/Developers/gen_docu.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Developers/gen_docu.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -10,16 +10,18 @@
 Developers working on ``flex_extract`` should make extensive use of the prepared test cases, unit tests and update the documentation. For this, some additional software is necessary:
 
-- pylint
-- pytest
-- mock
-- graphviz
-- sphinx
-- pip install sphinxcontrib-exceltable
-- pip install seqdiag
-- pip install sphinxcontrib-seqdiag
-- pip install sphinxcontrib-blockdiag
-- pip install pycallgraph
+.. code-block:: sh
 
-#- pip install sphinx-fortran
+  pip install pylint
+  pip install pytest
+  pip install mock
+  pip install graphviz
+  pip install sphinx
+  pip install sphinxcontrib-exceltable
+  pip install seqdiag
+  pip install sphinxcontrib-seqdiag
+  pip install sphinxcontrib-blockdiag
+  pip install pycallgraph
+
+
 
 
@@ -31,5 +33,5 @@
 
 It uses ``pyreverse`` to generate a class and a package diagram with graphviz and overwrites the old files in the developers directory. 
-``pyreverse`` creates ``dot`` files and with the ``dot`` program of the ``graphviz`` software the ``png`` files are created. Everything happens in the Python source directory before moving them finally to the ``for_developers`` directory. The Sphinx source code has a ``_files`` directory which contains links to these ``png`` files and therefore they should not be renamed.  
+``pyreverse`` creates ``dot`` files and with the ``dot`` program of the ``graphviz`` software the ``png`` files are created. Everything happens in the Python source directory before moving them finally to the ``For_developers`` directory. The Sphinx source code has a ``_files`` directory which contains links to these ``png`` files and therefore they should not be renamed.  
 
 
Index: For_developers/Sphinx/source/Documentation/Input/compilejob.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/compilejob.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/compilejob.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -74,5 +74,5 @@
       module load emos/455-r64
       export FLEXPART_ROOT_SCRIPTS=${HOME}
-      export MAKEFILE=Makefile.gfortran
+      export MAKEFILE=makefile_ecgate
       ;;
       *cca*)
@@ -88,5 +88,5 @@
       export SCRATCH=/scratch/ms/${GROUP}/${USER}
       export FLEXPART_ROOT_SCRIPTS=${HOME}
-      export MAKEFILE=Makefile.gfortran
+      export MAKEFILE=makefile_ecgate
       ;;
     esac
@@ -95,9 +95,9 @@
     cd ${FLEXPART_ROOT_SCRIPTS}/flex_extract_v${VERSION}   # if FLEXPART_ROOT is not set this means cd to the home directory
     tar -xvf ${HOME}/flex_extract_v${VERSION}.tar
-    cd source/fortran
-    \rm *.o *.mod CONVERT2 
+    cd Source/Fortran
+    \rm *.o *.mod calc_etadot 
     make -f ${MAKEFILE} >flexcompile 2>flexcompile
 
-    ls -l CONVERT2 >>flexcompile
+    ls -l calc_etadot >>flexcompile
     if [ $? -eq 0 ]; then
       echo 'SUCCESS!' >>flexcompile
Index: For_developers/Sphinx/source/Documentation/Input/control.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/control.rst	(revision d9abaac218cba1d37a790e022f19ce3b2ddde82c)
+++ For_developers/Sphinx/source/Documentation/Input/control.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -34,5 +34,5 @@
 --------------------------------
 
-A number of example files can be found in the directory :literal:`flex_extract_vX.X/run/control/`.
+A number of example files can be found in the directory :literal:`flex_extract_vX.X/Run/Control/`.
 They can be used as a template for adaptations and understand what's possible to 
 retrieve from ECMWF's archive.
Index: For_developers/Sphinx/source/Documentation/Input/control_params.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/control_params.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/control_params.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -4,4 +4,5 @@
      
     
+
     
 .. _ref-control-user:
Index: For_developers/Sphinx/source/Documentation/Input/ecmwf_env.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/ecmwf_env.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/Documentation/Input/ecmwf_env.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -3,5 +3,5 @@
 ****************************************
 
-This file contains the user credentials for working on ECMWF servers and transferring files between the ECMWF servers and the local gateway server. It is located in the ``flex_extract_vX.X/run`` directory and will be created in the installation process for the application modes **remote** and **gateway**.
+This file contains the user credentials for working on ECMWF servers and transferring files between the ECMWF servers and the local gateway server. It is located in the ``flex_extract_vX.X/Run`` directory and will be created in the installation process for the application modes **remote** and **gateway**.
 
 This file is based on the template ``ECMWF_ENV.template`` which is located in the ``templates`` directory.
@@ -9,5 +9,5 @@
 .. note::
  
-   In the **local** mode it is not present.
+   In the **local** mode this file is not present.
 
 
Index: For_developers/Sphinx/source/Documentation/Input/examples.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/examples.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/examples.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -3,5 +3,5 @@
 **********************
 
-``Flex_extract`` has a couple of example ``CONTROL`` files for a number of different data set constellations in the directory path ``flex_extract_vX.X/run/control``. 
+``Flex_extract`` has a couple of example ``CONTROL`` files for a number of different data set constellations in the directory path ``flex_extract_vX.X/Run/Control``. 
 
 Here is a list of the example files and a description of the data set:
@@ -10,27 +10,29 @@
    This file is not intended to be used with ``flex_extract``. It has a list of all possible parameters and their default values for a quick overview. 
    
-CONTROL_CERA
-CONTROL_CERA.global
-CONTROL_CERA.public
-CONTROL_EA5
-CONTROL_EA5.global
-CONTROL_EA5.public
-CONTROL_EI
-CONTROL_EI.global
-CONTROL_EI.public
-CONTROL_OD.ELDA.FC.eta.ens.double
-CONTROL_OD.ENFO.CF
-CONTROL_OD.ENFO.CV
-CONTROL_OD.ENFO.PF
-CONTROL_OD.ENFO.PF.36hours
-CONTROL_OD.ENFO.PF.ens
-CONTROL_OD.OPER.4V.operational
-CONTROL_OD.OPER.FC.36hours
-CONTROL_OD.OPER.FC.eta.global
-CONTROL_OD.OPER.FC.eta.highres
-CONTROL_OD.OPER.FC.gauss.highres
-CONTROL_OD.OPER.FC.operational
-CONTROL_OD.OPER.FC.twiceaday.1hourly
-CONTROL_OD.OPER.FC.twiceaday.3hourly
+.. code-block:: bash
+
+	CONTROL_CERA
+	CONTROL_CERA.global
+	CONTROL_CERA.public
+	CONTROL_EA5
+	CONTROL_EA5.global
+	CONTROL_EA5.public
+	CONTROL_EI
+	CONTROL_EI.global
+	CONTROL_EI.public
+	CONTROL_OD.ELDA.FC.eta.ens.double
+	CONTROL_OD.ENFO.CF
+	CONTROL_OD.ENFO.CV
+	CONTROL_OD.ENFO.PF
+	CONTROL_OD.ENFO.PF.36hours
+	CONTROL_OD.ENFO.PF.ens
+	CONTROL_OD.OPER.4V.operational
+	CONTROL_OD.OPER.FC.36hours
+	CONTROL_OD.OPER.FC.eta.global
+	CONTROL_OD.OPER.FC.eta.highres
+	CONTROL_OD.OPER.FC.gauss.highres
+	CONTROL_OD.OPER.FC.operational
+	CONTROL_OD.OPER.FC.twiceaday.1hourly
+	CONTROL_OD.OPER.FC.twiceaday.3hourly
 
     
Index: For_developers/Sphinx/source/Documentation/Input/fortran_makefile.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/fortran_makefile.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/fortran_makefile.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -1,14 +1,14 @@
-***********************************
-The Fortran Makefile - ``CONVERT2``
-***********************************
+**************************************
+The Fortran Makefile - ``calc_etadot``
+**************************************
 
 .. _ref-convert:
 
 ``Flex_extract``'s Fortran program will be compiled during 
-the installation process to get the executable named ``CONVERT2``. 
+the installation process to get the executable named ``calc_etadot``. 
 
-``flex_extract`` has a couple of ``Makefiles`` prepared which can be found in the directory 
-``flex_extract_vX.X/source/fortran``, where ``vX.X`` should be substituted with the current version number.
-A list of these ``Makefiles`` are shown below: 
+``Flex_extract`` has a couple of ``makefiles`` prepared which can be found in the directory 
+``flex_extract_vX.X/Source/Fortran``, where ``vX.X`` should be substituted with the current version number.
+A list of these ``makefiles`` are shown below: 
 
 
@@ -16,8 +16,8 @@
 | Files to be used as they are!
     
-    | **Makefile.gfortran**
+    | **makefile_ecgate**
     | For the use on ECMWF's server **ecgate**.
 
-    | **Makefile.CRAY**
+    | **makefile_cray**
     | For the use on ECMWF's server **cca/ccb**. 
     
@@ -25,12 +25,12 @@
 | It is necessary to adapt **ECCODES_INCLUDE_DIR** and **ECCODES_LIB**
  
-    | **Makefile.local.gfortran**
-    | For the use with gfortran compiler.
+    | **makefile_fast**
+    | For the use with gfortran compiler and optimization mode.
 
-    | **Makefile.local.ifort**
-    | For the use with ifort compiler.
+    | **makefile_debug**
+    | For the use with gfortran compiler in debugging mode.
 
 
-For instructions on how to adapt the ``Makefiles`` for the local application mode
+For instructions on how to adapt the ``makefiles`` for the local application mode
 please see :ref:`ref-install-local`.
 
Index: For_developers/Sphinx/source/Documentation/Input/jobscript.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/jobscript.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/jobscript.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -5,6 +5,6 @@
 The jobscript is a Korn-shell script which will be created at runtime for each ``flex_extract`` execution in the application modes **remote** and **gateway**.
 
-It is based on the ``job.temp`` template file which is stored in the ``templates`` directory.
-This template is by itself generated in the installation process from a ``jobscript.template`` template file.
+It is based on the ``job.temp`` template file which is stored in the ``Templates`` directory.
+This template is by itself generated in the installation process from a ``job.template`` template file.
 
 ``Flex_extract`` uses the python package `genshi <https://genshi.edgewall.org/>`_ to generate
@@ -74,5 +74,5 @@
       module load eccodes/2.12.0
       module load emos/455-r64
-      export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
+      export PATH=${PATH}:${HOME}/flex_extract_v7.1/Source/Python
       ;;
       *cca*)
@@ -83,5 +83,5 @@
       module load emos
       export SCRATCH=${TMPDIR}
-      export PATH=${PATH}:${HOME}/flex_extract_v7.1/source/python
+      export PATH=${PATH}:${HOME}/flex_extract_v7.1/Source/Python
       ;;
     esac
Index: For_developers/Sphinx/source/Documentation/Input/run.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/run.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/run.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -11,7 +11,4 @@
 Based on these input information ``flex_extract`` applies one of the application modes to either retrieve the ECMWF data via a Web API on a local maschine or submit a jobscript to ECMWF servers and retrieve the data there with sending the files to the local system eventually.
 
-
-
-PUT IN HERE A BLOCKDIAGRAM OF RAW PROGRAM FLOW
 
 
@@ -43,5 +40,5 @@
 
 It is also possible to start ``flex_extract`` directly from command line by using the ``submit.py`` script instead of the wrapping Shell script ``run.sh``.  This top-level script is located in 
-``flex_extract_vX.X/source/python`` and is executable. With the ``help`` parameter we see again all possible 
+``flex_extract_vX.X/Source/Python`` and is executable. With the ``help`` parameter we see again all possible 
 command line parameter. 
 
Index: For_developers/Sphinx/source/Documentation/Input/setup.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/setup.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/setup.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -13,5 +13,5 @@
 - copying tar-ball to target location (depending on application mode and installation path)
 - submit compilation script to batch queue at ECMWF servers (in **remote** and **gateway** mode) or just untar tar-ball at target location (**local mode**)
-- compilation of the FORTRAN90 program ``CONVERT2``
+- compilation of the FORTRAN90 program ``calc_etadot``
 
 
@@ -156,5 +156,5 @@
 
 It is also possible to start the installation process of ``flex_extract`` directly from command line by using the ``install.py`` script instead of the wrapping Shell script ``setup.sh``.  This top-level script is located in 
-``flex_extract_vX.X/source/python`` and is executable. With the ``help`` parameter we see again all possible 
+``flex_extract_vX.X/Source/Python`` and is executable. With the ``help`` parameter we see again all possible 
 command line parameter. 
 
Index: For_developers/Sphinx/source/Documentation/Input/templates.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Input/templates.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Input/templates.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -3,5 +3,5 @@
 *********
 
-In ``flex_extract`` we use the Python package ``genshi`` (`ref <https://genshi.edgewall.org/>`_) to create specific files from templates. It is the most efficient way to be able to quickly adapt e.g. the job scripts send to the ECMWF batch queue system or the namelist file für the Fortran program without the need to change the program code. 
+In ``flex_extract`` we use the Python package `genshi <https://genshi.edgewall.org/>`_ to create specific files from templates. It is the most efficient way to be able to quickly adapt e.g. the job scripts send to the ECMWF batch queue system or the namelist file für the Fortran program without the need to change the program code. 
 
 .. note::
@@ -15,6 +15,6 @@
 ----------
 
-    This is the template for a Fortran namelist file called ``fort.4`` which will be read by ``CONVERT2``.
-    It contains all the parameters ``CONVERT2`` needs. 
+    This is the template for a Fortran namelist file called ``fort.4`` which will be read by ``calc_etadot``.
+    It contains all the parameters ``calc_etadot`` needs. 
     
     .. code-block:: fortran
@@ -125,5 +125,5 @@
         cd $${FLEXPART_ROOT_SCRIPTS}/flex_extract_v$${VERSION}   # if FLEXPART_ROOT is not set this means cd to the home directory
         tar -xvf $${HOME}/flex_extract_v$${VERSION}.tar
-        cd source/fortran
+        cd Source/Fortran
         \rm *.o *.mod $fortran_program 
         make -f $${MAKEFILE} >flexcompile 2>flexcompile
@@ -191,5 +191,5 @@
           module load eccodes/2.12.0
           module load emos/455-r64
-          export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
+          export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
           ;;
           *cca*)
@@ -200,5 +200,5 @@
           module load emos
           export SCRATCH=$${TMPDIR}
-          export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/source/python
+          export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
           ;;
         esac
Index: For_developers/Sphinx/source/Documentation/Overview/app_modes.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Overview/app_modes.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Overview/app_modes.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -8,4 +8,5 @@
 .. _member state: https://www.ecmwf.int/en/about/who-we-are/member-states 
 .. _instructions: https://apps.ecmwf.int/registration/
+.. _ECMWF's instructions on gateway server: https://confluence.ecmwf.int/display/ECAC/ECaccess+Home
 
     
@@ -17,10 +18,10 @@
 
   1. Remote (member)
-      In the **Remote mode** the user works directly on ECMWF Linux member state server, such as ``ecgate`` or ``cca``. The software will be installed in the ``$HOME`` directory. The user does not need to install any of the additional third-party libraries mentioned in :ref:`ref-requirements` as ECMWF provides everything with environment modules. The module selection will be done automatically in ``flex_extract``. 
+      In the **Remote mode** the user works directly on ECMWF Linux member state server, such as ``ecgate`` or ``cca/ccb``. The software will be installed in the ``$HOME`` directory. The user does not need to install any of the additional third-party libraries mentioned in :ref:`ref-requirements` as ECMWF provides everything with environment modules. The module selection will be done automatically in ``flex_extract``. 
       
 .. _ref-gateway-desc:
       
   2. Gateway (member)
-      The **Gateway mode** can be used if a local member state gateway server is in place. Then the job scripts can be submitted to the ECMWF Linux member state server via the ECMWF web access tool ``ecaccess``. The installation script of ``flex_extract`` must be executed at the local gateway server such that the software will be installed in the ``$HOME`` directory at the ECMWF server and some extra setup is done in the local ``flex_extract`` directory at the local gateway server. For more information about establishing a gateway server please see section ???. For the **Gateway mode** the necessary environment has to be established which is described in :ref:`ref-prep-gateway`.
+      The **Gateway mode** can be used if a local member state gateway server is in place. Then the job scripts can be submitted to the ECMWF Linux member state server via the ECMWF web access tool ``ecaccess``. The installation script of ``flex_extract`` must be executed at the local gateway server such that the software will be installed in the ``$HOME`` directory at the ECMWF server and some extra setup is done in the local ``flex_extract`` directory at the local gateway server. For more information about establishing a gateway server please see `ECMWF's instructions on gateway server`_. For the **Gateway mode** the necessary environment has to be established which is described in :ref:`ref-prep-gateway`.
 
 .. _ref-local-desc:
Index: For_developers/Sphinx/source/Documentation/Overview/prog_flow.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/Overview/prog_flow.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/Overview/prog_flow.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -26,5 +26,5 @@
         It creates and sends MARS-requests either on the local machine or on ECMWF server, that receives the data and stores them in a specific format in GRIB files. If the parameter ``REQUEST`` was set ``1`` the data are not received but a file ``mars_requests.csv`` is created with a list of MARS requests and their settings. If it is set to ``2`` the file is created in addition to retrieving the data. The requests are created in an optimised way by splitting in time, jobs  and parameters.   
     3. Post-process data to create final ``FLEXPART`` input files:
-        After all data is retrieved, the disaggregation of flux fields (`see here <../disagg.html>`_ ) is done as well as the calculation of vertical velocity (`see here <../vertco.html>`_) by the Fortran program ``COVERT2``. Eventually, the GRIB fields are merged together such that a single grib file per time step is available with all fields for ``FLEXPART``. Since model level fields are typically in *GRIB2* format whereas surface level fields are still in *GRIB1* format, they can be converted into GRIB2 if parameter ``FORMAT`` is set to *GRIB2*. Please note, however, that older versions of FLEXPART may have difficulties reading pure *GRIB2* files since some parameter IDs change in *GRIB2*. If the retrieval is executed remotely at ECMWF, the resulting files can be communicated to the local gateway server via the ``ECtrans`` utility if the parameter ``ECTRANS`` is set to ``1`` and the parameters ``GATEWAY``, ``DESTINATION`` have been set properly during installation. The status of the transfer can be checked with the command ``ecaccess-ectrans-list`` (on the local gateway server). If the script is executed locally the progress of the script can be followed with the usual Linux tools.
+        After all data is retrieved, the disaggregation of flux fields (`see here <../disagg.html>`_ ) is done as well as the calculation of vertical velocity (`see here <../vertco.html>`_) by the Fortran program ``calc_etadot``. Eventually, the GRIB fields are merged together such that a single grib file per time step is available with all fields for ``FLEXPART``. Since model level fields are typically in *GRIB2* format whereas surface level fields are still in *GRIB1* format, they can be converted into GRIB2 if parameter ``FORMAT`` is set to *GRIB2*. Please note, however, that older versions of FLEXPART may have difficulties reading pure *GRIB2* files since some parameter IDs change in *GRIB2*. If the retrieval is executed remotely at ECMWF, the resulting files can be communicated to the local gateway server via the ``ECtrans`` utility if the parameter ``ECTRANS`` is set to ``1`` and the parameters ``GATEWAY``, ``DESTINATION`` have been set properly during installation. The status of the transfer can be checked with the command ``ecaccess-ectrans-list`` (on the local gateway server). If the script is executed locally the progress of the script can be followed with the usual Linux tools.
 
 
Index: For_developers/Sphinx/source/Documentation/input.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/input.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/input.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -35,6 +35,6 @@
 
        cd flex_extract_vX.X
-       python3 source/python/install.py --help
-       python3 source/python/submit.py --help
+       python3 Source/Python/install.py --help
+       python3 Source/Python/submit.py --help
    
     In this new version we provide also the wrapping Shell scripts setup_ and run_, which sets the command line parameters, do some checks and execute the corresponing Python scripts ``install.py`` and ``submit.py`` respectivley. 
Index: For_developers/Sphinx/source/Documentation/output.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/output.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/output.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -106,5 +106,5 @@
 -------------------------------------------------------
 
-The new disaggregation method for precipitation fields produces two additional precipitation fields for each time step and precipitation type. They serve as sub-grid points in the original time interval. For details of the method see :doc:`disagg` ??????????????????.
+The new disaggregation method for precipitation fields produces two additional precipitation fields for each time step and precipitation type. They serve as sub-grid points in the original time interval. For details of the method see :doc:`disagg`.
 The two additional fields are marked with the ``step`` parameter in the Grib messages and are set to "1" and "2" for sub-grid point 1 and 2 respectively.
 The output filenames do not change in this case.  
@@ -129,5 +129,5 @@
 ===============
 
-``Flex_extract`` works with a number of temporary data files which are usually deleted after a successful data extraction. They are only stored if the ``DEBUG`` mode is switched on (see :doc:`Input/control_params`. 
+``Flex_extract`` works with a number of temporary data files which are usually deleted after a successful data extraction. They are only stored if the ``DEBUG`` mode is switched on (see :doc:`Input/control_params`). 
 
 MARS grib files
@@ -220,5 +220,5 @@
 ----------
 
-There are a number of input files for the ``CONVERT2`` Fortran program named
+There are a number of input files for the ``calc_etadot`` Fortran program named
 
 .. code-block:: bash
@@ -245,9 +245,9 @@
     "22", "total cloud water content (optional)"
 
-Some of the fields are solely retrieved with specific settings, e.g. the eta-coordinate vertical velocity is not available in ERA-Interim datasets and the total cloud water content is an optional field for ``FLEXPART v10`` and newer. Please see section ????????? for more information. 
-
-The ``CONVERT2`` program saves its results in file ``fort.15`` which typically contains:
-
-.. csv-table:: Output file of the Fortran program ``CONVERT2``
+Some of the fields are solely retrieved with specific settings, e.g. the eta-coordinate vertical velocity is not available in ERA-Interim datasets and the total cloud water content is an optional field for ``FLEXPART v10`` and newer. 
+
+The ``calc_etadot`` program saves its results in file ``fort.15`` which typically contains:
+
+.. csv-table:: Output file of the Fortran program ``calc_etadot``
     :header: "Number", "Content"
     :widths: 5, 20
@@ -255,9 +255,9 @@
     "15", "U and V wind components, eta-coordinate vertical velocity, temperature, surface pressure, specific humidity " 
     
-More details about the content of ``CONVERT2`` can be found in :doc:`vertco`.    
+More details about the content of ``calc_etadot`` can be found in :doc:`vertco`.    
     
 .. note::
  
-    The ``fort.4`` file is the namelist file to drive the Fortran program ``CONVERT2``. It is therefore also an input file and is described in ???????????????
+    The ``fort.4`` file is the namelist file to drive the Fortran program ``calc_etadot``. It is therefore also an input file.
     
     Example of a namelist:
Index: For_developers/Sphinx/source/Documentation/overview.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/overview.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/overview.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -30,5 +30,5 @@
            - Api
              
-       - Fortran program - CONVERT2
+       - Fortran program - calc_etadot
            
            - Package diagram
Index: For_developers/Sphinx/source/Documentation/vertco.rst
===================================================================
--- For_developers/Sphinx/source/Documentation/vertco.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Documentation/vertco.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -23,8 +23,8 @@
 ===================================================================================
 
-The vertical velocity is computed by the FORTRAN90 program ``CONVERT2`` in the ECMWF
-vertical coordinate system by applying the equation of continuity and thereby ensuring mass consistent 3D wind fields. A detailed description of ``CONVERT2`` can be found in the
+The vertical velocity is computed by the FORTRAN90 program ``calc_etadot`` in the ECMWF
+vertical coordinate system by applying the equation of continuity and thereby ensuring mass consistent 3D wind fields. A detailed description of ``calc_etadot`` can be found in the
 documents v20_update_protocol.pdf, V30_update_protocol.pdf and
-V40_update_protocol.pdf. The computational demand and accuracy of ``CONVERT2`` is highly
+V40_update_protocol.pdf. The computational demand and accuracy of ``calc_etadot`` is highly
 dependent on the specification of parameters ``GAUSS``, ``RESOL`` and ``SMOOTH``. The
 following guidance can be given for choosing the right parameters:
@@ -45,5 +45,5 @@
 ======================================================================
 
-Since November 2008, the parameter 77 (deta/dt) is stored in ``MARS`` on full model levels. ``FLEXTRA``/``FLEXPART`` in its current version requires ``deta/dt`` on model half levels, multiplied by ``dp/deta``. In ``flex_extract``, the program ``CONVERT2`` assumes that this parameter is available if the ``CONTROL`` parameter ``ETA`` is set to 1. 
+Since November 2008, the parameter 77 (deta/dt) is stored in ``MARS`` on full model levels. ``FLEXTRA``/``FLEXPART`` in its current version requires ``deta/dt`` on model half levels, multiplied by ``dp/deta``. In ``flex_extract``, the program ``calc_etadot`` assumes that this parameter is available if the ``CONTROL`` parameter ``ETA`` is set to 1. 
 
 It is recommended to use the pre-calculated parameter 77 by setting ``ETA`` to 1 whenever possible.
Index: For_developers/Sphinx/source/Evaluation/testcases.rst
===================================================================
--- For_developers/Sphinx/source/Evaluation/testcases.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Evaluation/testcases.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -7,5 +7,5 @@
 ===========================
 
-
+  UNDER CONSTRUCTION
 
 
@@ -14,5 +14,5 @@
 ========================
 
-
+  UNDER CONSTRUCTION
 
 
Index: For_developers/Sphinx/source/Installation/gateway.rst
===================================================================
--- For_developers/Sphinx/source/Installation/gateway.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/Installation/gateway.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -66,10 +66,10 @@
    
    $ ecaccess-certificate-create
-   Please enter your user-id: example_username
+   Please enter your user-id: <username>
    Your passcode: ***
    
    
    
-The easiest way to install all required packages is to use the package management system of your Linux distribution which required admin rights.
+The easiest way to install all required packages is to use the package management system of your Linux distribution which requires admin rights.
 The installation was tested under *GNU/Linux Debian buster* and *Ubuntu 18.04 Bionic Beaver*.
 
@@ -106,26 +106,33 @@
 ====================
 
-``Flex_extract`` will be run on an ECMWF server which makes the setup the same as for the **remote mode**. In the ``setup.sh`` script `[ref] <Documentation/Input/setup.html>`_, select the ``makefile.gfortran`` for the ``CONVERT2`` Fortran program and the ECMWF server (*target*) you would like to use. 
+``Flex_extract`` will be run on an ECMWF server which makes the setup the same as for the **remote mode**. In the ``setup.sh`` script :doc:`../Documentation/Input/setup`, select the ``makefile_ecgate`` or ``makefile_cray`` for the ``calc_etadot`` Fortran program and the ECMWF server (*target*) you would like to use. 
 The job script, send to the job queue via the ECaccess software, loads the required modules from the module system. For enabling the file transfer via the gateway, you have to set the *ECUID*, *ECGID*, *GATEWAY* and *DESTINATION* parameter values.
+
+Open ``setup.sh`` with your preferred editor (e.g., nano) and adapt the values:  
    
++----------------------------------------------+----------------------------------------------+   
+|   Use this for target = **ectrans**          |   Use this for target = **cca** or **ccb**   | 
++----------------------------------------------+----------------------------------------------+
+| .. code-block:: bash                         | .. code-block:: bash                         | 
+|                                              |                                              | 
+|   ...                                        |   ...                                        |   
+|   # -----------------------------------------|   # -----------------------------------------|
+|   # AVAILABLE COMMANDLINE ARGUMENTS TO SET   |   # AVAILABLE COMMANDLINE ARGUMENTS TO SET   |
+|   #                                          |   #                                          |  
+|   # THE USER HAS TO SPECIFY THESE PARAMETER  |   # THE USER HAS TO SPECIFY THESE PARAMETER  | 
+|   #                                          |   #                                          |
+|   TARGET='ecgate'                            |   TARGET='cca'                               |
+|   MAKEFILE='makefile_ecgate'                 |   MAKEFILE='makefile_cray'                   |  
+|   ECUID='<username>'                         |   ECUID='<username>'                         |  
+|   ECGID='<groupID>'                          |   ECGID='<groupID>'                          |
+|   GATEWAY='<gatewayname>'                    |   GATEWAY='<gatewayname>'                    |
+|   DESTINATION='<assoc_name>@genericSftp'     |   DESTINATION='<assoc_name>@genericSftp'     | 
+|   INSTALLDIR=None                            |   INSTALLDIR=None                            | 
+|   JOB_TEMPLATE='job.template'                |   JOB_TEMPLATE='job.template'                |
+|   CONTROLFILE='CONTROL_EA5'                  |   CONTROLFILE='CONTROL_EA5'                  | 
+|   ...                                        |   ...                                        |   
++----------------------------------------------+----------------------------------------------+
 
-.. code-block:: bash
-    :caption: 'Example settings for a gateway installation.'
-    :name: setup.sh
-    
-    # -----------------------------------------------------------------
-    # AVAILABLE COMMANDLINE ARGUMENTS TO SET
-    #
-    # THE USER HAS TO SPECIFY THESE PARAMETER
-    #
-    TARGET='ecgate'
-    MAKEFILE='makefile.gfortran'
-    ECUID='uid'
-    ECGID='gid'
-    GATEWAY='localserver.tld'
-    DESTINATION='association_name@genericSftp'
-    INSTALLDIR=None
-    JOB_TEMPLATE='job.template'
-    CONTROLFILE='CONTROL_EA5'
+
 
 
@@ -146,23 +153,17 @@
    You should get an email with subject "flexcompile" within the next few minutes!
 
-``Flex_extract`` uses the email address connectd to the user account on ECMWF servers. The email content should look like this with a "SUCCESS" statement in the last line:
+``Flex_extract`` automatically uses the email address connected to the user account on ECMWF servers. The email content should look like this with a "SUCCESS" statement in the last line:
 
 .. code-block:: bash
 
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp phgrreal.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp grphreal.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp ftrafo.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g rwGRIB2.f90
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g posnam.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g preconvert.f90
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -g -O3 -o ./CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o -L/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3   
-    -rwxr-x---. 1 USER at 353134 May 23 12:27 CONVERT2
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./rwgrib2.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./phgrreal.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./grphreal.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./ftrafo.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./calc_etadot.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./posnam.f90
+    gfortran   rwgrib2.o calc_etadot.o ftrafo.o grphreal.o posnam.o phgrreal.o -o calc_etadot_fast.out  -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -fopenmp
+    ln -sf calc_etadot_fast.out calc_etadot
+    lrwxrwxrwx. 1 <username> at 20 Mar  8 14:11 calc_etadot -> calc_etadot_fast.out
     SUCCESS!    
-    
-    
-    
-    
 
-    
-    
-         
Index: For_developers/Sphinx/source/Installation/local.rst
===================================================================
--- For_developers/Sphinx/source/Installation/local.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/Installation/local.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -62,5 +62,5 @@
 | * `eccodes for python`_                        | * `emoslib`_    |
 | * `ecmwf-api-client`_ (everything except ERA5) |                 |
-| * `cdsapi`_ (just for ERA5)                    |                 |
+| * `cdsapi`_ (just for ERA5 and member user)    |                 |
 +------------------------------------------------+-----------------+
 
@@ -116,5 +116,5 @@
      
 CDS API:
-   Go to 'CDS API registration'_ and register there too. Log in at the `cdsapi`_ website and follow the instructions at section "Install the CDS API key" to save your credentials in a `.cdsapirc` file.
+   Go to `CDS API registration`_ and register there too. Log in at the `cdsapi`_ website and follow the instructions at section "Install the CDS API key" to save your credentials in a `.cdsapirc` file.
 
    
@@ -263,6 +263,4 @@
 
 
-
-
 .. _ref-install-local:
 
@@ -270,13 +268,8 @@
 ==================
 
-First prepare the Fortran ``makefile`` for your environment and set it in the ``setup.sh`` script. (See section :ref:`ref-convert` for information on the Fortran program.)
-``flex_extract`` comes with two ``makefiles`` prepared for the ``gfortran`` and 
-the ``ifort`` compiler. The ``gfortran`` version assumes that ``eccodes`` and ``emoslib`` are installed as distribution packages.
-
- * makefile.local.gfortran
- * makefile.local.ifort
+First prepare the Fortran ``makefile`` for your environment and set it in the ``setup.sh`` script. (See section :ref:`Fortran Makefile <ref-convert>` for more information.)
+``flex_extract`` comes with two ``makefiles`` prepared for the ``gfortran`` compiler. One for the normal use ``makefile_fast`` and one for debugging ``makefile_debug`` which is usually only resonable for developers.
  
-They can be found at ``flex_extract_vX.X/Source/Fortran``, where
-``vX.X`` should be substituted with the current version number.
+They assume that ``eccodes`` and ``emoslib`` are installed as distribution packages and can be found at ``flex_extract_vX.X/Source/Fortran``, where ``vX.X`` should be substituted with the current version number.
 
 .. caution::   
@@ -291,5 +284,5 @@
 
    cd flex_extract_vX.X/Source/Fortran
-   nedit makefile.local.gfortran
+   nedit makefile_fast
  
 Edit the paths to the ``eccodes`` library on your local machine. 
@@ -319,5 +312,5 @@
    
     
-The Fortran program called ``CONVERT2`` will be compiled during the 
+The Fortran program called ``calc_etadot`` will be compiled during the 
 installation process.Therefore the name of the ``makefile`` to be used needs to be given in  ``setup.sh``.
 
@@ -338,5 +331,5 @@
    #
    TARGET='local'
-   MAKEFILE='makefile.local.gfortran'
+   MAKEFILE='makefile_fast'
    ECUID=None
    ECGID=None
@@ -360,22 +353,19 @@
 .. code-block:: bash
 
-   # Output of setup.sh   
-   WARNING: installdir has not been specified
-   flex_extract will be installed in here by compiling the Fortran source in /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/source/fortran
-   Install flex_extract_v7.1 software at local in directory /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1
-
-   Using makefile: Makefile.local.gfortran
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp phgrreal.f
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp grphreal.f
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp ftrafo.f
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -fopenmp -I. -I/usr/local/gcc-4.9.3/grib_api-1.14.3/include -O3 rwGRIB2.f90
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -fopenmp -I. -I/usr/local/gcc-4.9.3/grib_api-1.14.3/include -O3 posnam.f
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -fopenmp -I. -I/usr/local/gcc-4.9.3/grib_api-1.14.3/include -O3 preconvert.f90
-   gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -O3 -O3 -fopenmp -o ./CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o -L/usr/local/gcc-4.9.3/grib_api-1.14.3/lib -Bstatic  -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic  -lm  -ljasper -lemosR64
-
-   -rwxrwxr-x. 1 philipa8 tmc 282992 May 23 22:27 ./CONVERT2
-
-
-
-
-
+    # Output of setup.sh   
+	WARNING: installdir has not been specified
+	flex_extract will be installed in here by compiling the Fortran source in <path-to-flex_extract>/flex_extract_v7.1/Source/Fortran
+	Install flex_extract_v7.1 software at local in directory <path-to-flex_extract>/flex_extract_v7.1
+
+	Using makefile: makefile_fast
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./rwgrib2.f90
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./phgrreal.f90
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./grphreal.f90
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./ftrafo.f90
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./calc_etadot.f90
+	gfortran   -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -I. -I/usr/local/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./posnam.f90
+	gfortran  rwgrib2.o calc_etadot.o ftrafo.o grphreal.o posnam.o phgrreal.o -o calc_etadot_fast.out  -O3 -march=native -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper -lemosR64 -fopenmp
+	ln -sf calc_etadot_fast.out calc_etadot
+
+	lrwxrwxrwx. 1 <username> tmc 20 15. Mär 13:31 ./calc_etadot -> calc_etadot_fast.out
+
Index: For_developers/Sphinx/source/Installation/remote.rst
===================================================================
--- For_developers/Sphinx/source/Installation/remote.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/Installation/remote.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -77,6 +77,5 @@
    ssh -X <ecuid>@ecaccess.ecmwf.int
 
-This will lead to the following output on the command line, asking for your 
-password:
+This will lead to the following output on the command line, asking for your password:
    
 .. code-block:: bash
@@ -117,10 +116,10 @@
 Execute the ``setup.sh`` script from the ``flex_extract``'s root directory. 
 Before executing it, it is necessary to adapt some parameters from ``setup.sh``
-described in :doc:`Documentation/Input/setup`. 
+described in :doc:`../Documentation/Input/setup`. 
 
-Open ``setup.sh`` with your preferred editor (e.g., ``nano'') and adapt the values:  
+Open ``setup.sh`` with your preferred editor (e.g., nano) and adapt the values:  
    
 +----------------------------------------------+----------------------------------------------+   
-|   Use this for target = **ectrans**          |   Use this for target = **cca**              | 
+|   Use this for target = **ectrans**          |   Use this for target = **cca** or **ccb**   | 
 +----------------------------------------------+----------------------------------------------+
 | .. code-block:: bash                         | .. code-block:: bash                         | 
@@ -133,9 +132,9 @@
 |   #                                          |   #                                          |
 |   TARGET='ecgate'                            |   TARGET='cca'                               |
-|   MAKEFILE='Makefile.gfortran'               |   MAKEFILE='Makefile.CRAY'                   |  
-|   ECUID='uid'                                |   ECUID='uid'                                |  
-|   ECGID='gid'                                |   ECGID='gid'                                |
-|   GATEWAY=None                               |   GATEWAY=None                               |
-|   DESTINATION=None                           |   DESTINATION=None                           | 
+|   MAKEFILE='makefile_ecgate'                 |   MAKEFILE='makefile_cray'                   |  
+|   ECUID='<username>'                         |   ECUID='<username>'                         |  
+|   ECGID='<groupID>'                          |   ECGID='<groupID>'                          |
+|   GATEWAY='<gatewayname>'                    |   GATEWAY='<gatewayname>'                    |
+|   DESTINATION='<username>@genericSftp'       |   DESTINATION='<username>@genericSftp'       | 
 |   INSTALLDIR=None                            |   INSTALLDIR=''                              | 
 |   JOB_TEMPLATE='job.template'                |   JOB_TEMPLATE='job.template'                |
@@ -169,20 +168,17 @@
 
     
-``Flex_extract`` uses the email address connectd to the user account on ECMWF servers. The email content should look like this with a "SUCCESS" statement in the last line:
+``Flex_extract`` automatically uses the email address connected to the user account on ECMWF servers. The email content should look like this with a "SUCCESS" statement in the last line:
 
 .. code-block:: bash
 
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp phgrreal.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp grphreal.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -g -O3 -fopenmp ftrafo.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g rwGRIB2.f90
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g posnam.f
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -c -O3 -I. -I/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/include -g preconvert.f90
-    gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  -g -O3 -o ./CONVERT2 ftrafo.o phgrreal.o grphreal.o rwGRIB2.o posnam.o preconvert.o -L/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.12.0/GNU/6.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3   
-    -rwxr-x---. 1 USER at 353134 May 23 12:27 CONVERT2
-    SUCCESS!    
-
-
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./rwgrib2.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./phgrreal.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./grphreal.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./ftrafo.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./calc_etadot.f90
+    gfortran    -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -I. -I/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/include -fdefault-real-8 -fopenmp -fconvert=big-endian   -c	./posnam.f90
+    gfortran   rwgrib2.o calc_etadot.o ftrafo.o grphreal.o posnam.o phgrreal.o -o calc_etadot_fast.out  -O3 -march=native -L/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -Wl,-rpath,/usr/local/apps/eccodes/2.13.0/GNU/7.3.0/lib -leccodes_f90 -leccodes -ljasper -lpthread -L/usr/local/apps/jasper/1.900.1/LP64/lib -ljasper -lm -L/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -Wl,-rpath,/usr/local/apps/libemos/000455/GNU/6.3.0/lib  -lemos.R64.D64.I32 -L/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -Wl,-rpath,/usr/local/apps/fftw/3.3.4/GNU/6.3.0/lib -lfftw3    -fopenmp
+    ln -sf calc_etadot_fast.out calc_etadot
+    lrwxrwxrwx. 1 <username> at 20 Mar  8 14:11 calc_etadot -> calc_etadot_fast.out
+    SUCCESS!
     
-
-    
Index: For_developers/Sphinx/source/Support/known_bugs_issues.rst
===================================================================
--- For_developers/Sphinx/source/Support/known_bugs_issues.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/Support/known_bugs_issues.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -1,4 +1,25 @@
 Known Bugs and Issues
-=====================
+*********************
 
- 
+Release v7.1
+============
+
+
+CDS API and ERA5 data
+---------------------
+
+  See ticket `#230 <https://www.flexpart.eu/ticket/230>`_  on flexpart.eu for information.
+
+
+Installation problems with ``GATEWAY`` and ``DESTINATION`` parameters
+---------------------------------------------------------------------
+
+  See ticket `#263 <https://www.flexpart.eu/ticket/263>`_  on flexpart.eu for information.
+
+
+Installation problems with the Fortran program ``calc_etadot``
+--------------------------------------------------------------
+
+   See ticket `#264 <https://www.flexpart.eu/ticket/264>`_  on flexpart.eu for information.
+
+
Index: For_developers/Sphinx/source/changelog.rst
===================================================================
--- For_developers/Sphinx/source/changelog.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/changelog.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -9,4 +9,17 @@
 .. _ECMWF Web API: https://confluence.ecmwf.int/display/WEBAPI/ECMWF+Web+API+Home
 .. _new algorithm: https://www.geosci-model-dev.net/11/2503/2018/
+
+
+.. _ref-v711:
+
+Release v7.1.1
+--------------
+
+Bug fixes
+#########
+   * corrected naming of makefiles and Fortran program executable in online documentation
+   * adapted checking for ``GATEWAY`` and ``DESTINATION`` parameter 
+   * fixed makefiles to use f90 Fortran files for ECMWF server
+
     
 .. _ref-v71: 
@@ -33,4 +46,5 @@
    * completely revised/refactored python section
    * restructured program directories
+   * Fortran program name changed from ``CONVERT2`` to ``calc_etadot``
 
 .. _ref-v704:
Index: For_developers/Sphinx/source/conf.py
===================================================================
--- For_developers/Sphinx/source/conf.py	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/conf.py	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -28,5 +28,5 @@
 
 project = u'flex_extract'
-copyright = u'2019, Anne Philipp and Leopold Haimberger'
+copyright = u'2020, Anne Philipp and Leopold Haimberger'
 author = u'Anne Philipp and Leopold Haimberger'
 
Index: For_developers/Sphinx/source/dev_guide.rst
===================================================================
--- For_developers/Sphinx/source/dev_guide.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/dev_guide.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -4,4 +4,7 @@
     UNDER CONSTRUCTION
     
+.. note::
+
+  This section still needs to be done.
     
 .. repository (how /who manages the code, where to get)
Index: For_developers/Sphinx/source/documentation.rst
===================================================================
--- For_developers/Sphinx/source/documentation.rst	(revision ba9923062b4af98cbdd20c4101c305766fc728f5)
+++ For_developers/Sphinx/source/documentation.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -13,5 +13,5 @@
     Vertical Coordinate (Under construction)
       - Methods (GAUSS, ETA, OMEGA)
-      - CONVERT 
+      - calc_etadot 
     
     Auto Generated Documentation
Index: For_developers/Sphinx/source/evaluation.rst
===================================================================
--- For_developers/Sphinx/source/evaluation.rst	(revision d9abaac218cba1d37a790e022f19ce3b2ddde82c)
+++ For_developers/Sphinx/source/evaluation.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -4,5 +4,8 @@
     UNDER CONSTRUCTION
     
-  
+.. note::
+
+  This section in the online documentation still needs to be done.
+  Currently, evaluation methods and information can be found in the `flex_extract discussion paper <https://www.geosci-model-dev-discuss.net/gmd-2019-358/>`_ of the Geoscientific Model Development journal.
   
   
Index: For_developers/Sphinx/source/index.rst
===================================================================
--- For_developers/Sphinx/source/index.rst	(revision eca358dfa8af364441310b89aa1acf483b280f9a)
+++ For_developers/Sphinx/source/index.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -27,5 +27,5 @@
         <td style="width:30%;height:150px;">
           <div style="width:100%;height:60px;margin-left:20%;position:relative;">
-            <img style="position:absolute;height:90%;vertical-align:bottom;" src="">
+            <img style="position:absolute;height:90%;vertical-align:bottom;" src="_static/ecmwf_icon.png">
           </div>
           <h2><a href="ecmwf_data.html">ECMWF data</a></h2>
@@ -62,5 +62,5 @@
         <td style="width:30%;height:150px;">
           <div style="width:100%;height:60px;margin-left:20%;position:relative;">
-            <img style="position:absolute;height:90%;vertical-align:bottom;" src="">
+            <img style="position:absolute;height:90%;vertical-align:bottom;" src="_static/check_icon.png">
           </div>
           <h2><a href="evaluation.html">Evaluation</a></h2>
@@ -73,5 +73,5 @@
         <td style="width:30%;height:150px;">
           <div style="width:100%;height:60px;margin-left:20%;position:relative;">
-            <img style="position:absolute;height:90%;vertical-align:bottom;" src="_static/guide_icon.png">
+            <img style="position:absolute;height:90%;vertical-align:bottom;" src="_static/dev_icon.png">
           </div>
           <h2><a href="dev_guide.html">Developer</a></h2>
@@ -94,8 +94,8 @@
           <h2><a href="changelog.html">Changelog</a></h2>
           <ul>
+            <li><a href="changelog.html#ref-v711">v7.1.1</a></li>
             <li><a href="changelog.html#ref-v71">v7.1</a></li>
             <li><a href="changelog.html#ref-v704">v7.0.4</a></li>
             <li><a href="changelog.html#ref-v703">v7.0.3</a></li>
-            <li><a href="changelog.html#ref-v60">v6</a></li>
           </ul>
         </td>        
Index: For_developers/Sphinx/source/installation.rst
===================================================================
--- For_developers/Sphinx/source/installation.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/installation.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -124,5 +124,5 @@
     .. code-block:: bash
 
-       $ git clone --single-branch --branch master https://www.flexpart.eu/gitmob/flexpart
+       $ git clone --single-branch --branch master https://www.flexpart.eu/gitmob/flex_extract
 
 
@@ -223,5 +223,5 @@
 --------------------
 
-To check whether the Fortran program ``CONVERT2`` has been compiled and runs properly, it can be applied to a prepared minimal dataset.
+To check whether the Fortran program ``calc_etadot`` has been compiled and runs properly, it can be applied to a prepared minimal dataset.
 
 For this, go from the ``flex_extract`` root directory to the ``Testing/Installation/Convert/`` directory and execute the Fortran program.
@@ -234,17 +234,13 @@
    cd Testing/Installation/Convert
    # execute the Fortran progam without arguments
-   ../../../Source/Fortran/CONVERT2
+   ../../../Source/Fortran/calc_etadot
 
 The installation was successfull if you obtain on standard output:
 
 .. code-block:: bash
-
-    readspectral:            1  records read
-    readlatlon:            8  records read
-   STATISTICS:  98842.4598 98709.7359  5120.5385
-    readlatlon:            4  records read
-    readlatlon:            4  records read
-    readlatlon:            4  records read
-   SUCCESSFULLY FINISHED CONVERT_PRE: CONGRATULATIONS
+    
+    STATISTICS:          98842.4598  98709.7359   5120.5385
+    STOP SUCCESSFULLY FINISHED calc_etadot: CONGRATULATIONS
+
 
 Now go back to the root directory:
Index: For_developers/Sphinx/source/quick_start.rst
===================================================================
--- For_developers/Sphinx/source/quick_start.rst	(revision 30f7911a6e9f08ea7e46542a8f3383d7cd5b8f00)
+++ For_developers/Sphinx/source/quick_start.rst	(revision b1674ed9a3275890229aaf2e958f2ea7db4f28ac)
@@ -31,5 +31,5 @@
 The ``Jobscripts`` directory is used to store the Korn shell job scripts generated by a ``flex_extract`` run in the **Remote** or **Gateway** mode. They are used to submit the setup information to the ECMWF server and start the jobs in ECMWF's batch mode. The typical user must not touch these files. They will be generated from template files which are stored in the ``Templates`` directory under ``flex_extract_vX.X``. Usually there will be a ``compilejob.ksh`` and a ``job.ksh`` script which are explained in the section :doc:`Documentation/input`. In the rare case of operational data extraction there will be a ``joboper.ksh`` which is designed to get the time parameters from environment variables at the ECMWF servers.
 
-The ``Controls`` directory contains a number of example ``CONTROL`` files. These``CONTROL`` files represent the current range of possible dataset retrievals with ``flex_extract``. Some parameters in the ``CONTROL`` files can be adapted and some others should not be changed. In this :doc:`quick_start` guide we explain how an extraction with ``flex_extract`` can be started in the different :doc:`Documentation/Overview/app_modes` and point out some specifics of each dataset and ``CONTROL`` file.
+The ``Controls`` directory contains a number of example ``CONTROL`` files. These ``CONTROL`` files represent the current range of possible dataset retrievals with ``flex_extract``. Some parameters in the ``CONTROL`` files can be adapted and some others should not be changed. In this :doc:`quick_start` guide we explain how an extraction with ``flex_extract`` can be started in the different :doc:`Documentation/Overview/app_modes` and point out some specifics of each dataset and ``CONTROL`` file.
 
 Directly under ``Run`` you find the files ``run.sh`` and ``run_local.sh`` and according to your selected :doc:`Documentation/Overview/app_modes` there might also be a file named ``ECMWF_ENV`` for the user credentials to quickly and automatically access ECMWF servers.  
@@ -150,5 +150,5 @@
     │   ├── CE000908* (resulting files)
 
-If the job was submitted to the HPC ( ``queue=cca`` ) you may login to the HPC and look into the directory ``/scratch/ms/ECGID/ECUID/.ecaccess_do_not_remove`` for job logs. The working directories are deleted after job failure and thus normally cannot be accessed.
+If the job was submitted to the HPC ( ``queue=cca`` or  ``queue=ccb`` ) you may login to the HPC and look into the directory ``/scratch/ms/ECGID/ECUID/.ecaccess_do_not_remove`` for job logs. The working directories are deleted after job failure and thus normally cannot be accessed.
 
 To check if the resulting files are still transferred to local gateway server you can use the command ``ecaccess-ectrans-list`` or check the destination path for resulting files on your local gateway server. 
@@ -231,5 +231,4 @@
 
     
-!!!!!!!! ADD HERE ANOTHER SCREENSHOT OF THE PARAMETER SELECTION AREA ( HAS TO BE DONE AT HOME )
 
 Additionally, you can find a lot of helpful links to dataset documentations, direct links to specific dataset web catalogues or further general information at the `link collection <Ecmwf/ec-links.html>`_ in the ECMWF data section.    
@@ -276,5 +275,5 @@
 .. figure:: _files/dataset_cmp_table.png
 
-   DO THIS TABLE AGAIN BY HAND!
+
                     
 A common problem for beginners in retrieving ECMWF datasets is the mismatch in the definition of these parameters. For example, if you would like to retrieve operational data before ``June 25th 2013`` and set the maximum level to ``137`` you will get an error because this number of levels was first introduced at this effective day. So, be cautious in the combination of space and time resolution as well as the field types which are not available all the time. 
@@ -332,10 +331,7 @@
 
 This re-analysis dataset will exceed its end of production at 31st August 2019!
-It is then available from 1st January 1979 to 31st August 2019. The ``etadot`` is not available in this dataset. Therefore ``flex_extract`` must select the ``GAUSS`` parameter to retrieve the divergence field in addition. The vertical velocity is the calculated with the continuity equation in the Fortran program ``CONVERT2``. Since the analysis fields are only available for every 6th hour, the dataset can be made 3 hourly by adding forecast fields in between. No ensemble members are available.
-
-
-.. todo::
-
-    @LEO: please check the complete description and functionality of the CONTROL FILEs
+It is then available from 1st January 1979 to 31st August 2019. The ``etadot`` is not available in this dataset. Therefore ``flex_extract`` must select the ``GAUSS`` parameter to retrieve the divergence field in addition. The vertical velocity is the calculated with the continuity equation in the Fortran program ``calc_etadot``. Since the analysis fields are only available for every 6th hour, the dataset can be made 3 hourly by adding forecast fields in between. No ensemble members are available.
+
+
     
 Operational data
@@ -357,7 +353,4 @@
 These files defines the minimum number of parameters necessary to retrieve a daily subset. The setup of field types is optimal and should only be changed if the user understands what he does. The grid, domain and temporal resolution can be changed according to availability.      
     
-.. todo:: 
-    
-    @LEO - explain the setup with 4V fields! Who can extract it, when would this be useful? 
 
 
@@ -404,8 +397,5 @@
         CONTROL_OD.ENFO.PF.ens
 
-.. todo::
-
-    @LEO: Please tell me why perturbed forecast are possible? Is it because of some user rights? I have no opportunity of retrieve PF data.       
-    
+
     
     
