diff --git a/Documentation/User Manual/1-user-interface/0_start.md b/Documentation/User Manual/1-user-interface/0_start.md
index 5eac4b3a9b767b553b61a4726e3ce002cc6d8987..cf725f521e8e50f787efba842ba8e5f54aff857a 100644
--- a/Documentation/User Manual/1-user-interface/0_start.md	
+++ b/Documentation/User Manual/1-user-interface/0_start.md	
@@ -3,7 +3,7 @@ User Manual
 ====================================
 ![](pics/VECTOlarge.png)\
 \
-Version: VECTO 2.2 / VectoCore 3.0.2 / VectoCmd 3.0.2
+Version: VECTO 3.1 / VectoCore 3.1.0 / VectoCmd 3.1.0
 
 ---
 
@@ -13,14 +13,14 @@ VECTO is a tool for the calculation of energy consumption and CO~2~ emissions of
 This User Manual consists of 4 Parts:
 
 - [Graphical User Interface](#user-interface):
-    : Here graphical user interface of VECTO with all windows and configuration possibilities is described.
+    : Describes the graphical user interface of VECTO with all windows and configuration possibilities.
 - [Calculation Modes](#calculation-modes):
-    : The calculation modes of VECTO are described here (Declaration, Engineering, ...). 
+    : Describes the calculation modes of VECTO (Declaration, Engineering, ...). 
 - [Simulation Models](#simulation-models):
     : This chapter describes the used component models and formulas which are implemented in the software. 
 - [Input and Output](#input-and-output):
-    : The input and output file formats are described in this chapter.
+    : Describes the input and output file formats.
 
-This user manual describes both, version 2.2 and verson 3.0.x of Vecto. Vecto 3.x is a complete rewrite of Vecto 2.2 that uses the same models and input data and also produces the same output. However, in some parts version 3.x differs from version 2.2. The according paragraphs are highlighted accordingly.
+This user manual describes verson 3.1.x of Vecto. 
 
 
diff --git a/Documentation/User Manual/1-user-interface/B_mainform.md b/Documentation/User Manual/1-user-interface/B_mainform.md
index 9c22f27033b18ecb3ff510b12c7e77bb20c9949c..bfaae5123457db3644a7eb568a81fe61d97fd929 100644
--- a/Documentation/User Manual/1-user-interface/B_mainform.md	
+++ b/Documentation/User Manual/1-user-interface/B_mainform.md	
@@ -10,12 +10,11 @@
 
 The Main Form is loaded when starting VECTO. Closing this form will close VECTO even if other dialogs are still open. In this form all global settings can be controlled and all other application dialogs can be opened.
 
-In order to start a simulation the [Calculation Mode](#calculation-modes) must be set and at least one [Job File (.vecto)](#job-editor) must added to the Job List. After clicking START all checked files in the Job List will be calculated. From the user interface you can either run the simulation using Vecto 2.2 or Vecto 3.x by clicking the according START button on the left side of the window.
+In order to start a simulation the [Calculation Mode](#calculation-modes) must be set and at least one [Job File (.vecto)](#job-editor) must added to the Job List. After clicking START all checked files in the Job List will be calculated. 
 
-The Main Form includes three tabs as described below:
+The Main Form includes two tabs as described below:
 
 * Job Files Tab
-* Driving Cycles Tab (only if [Batch Mode](#batch-mode-1) is enabled)
 * Options Tab
 
 
@@ -56,12 +55,6 @@ Doubleclick entries to edit job files with the [VECTO Editor](#job-editor).
 Start VECTO in the selected mode (see [Options](#options-tab)).
 
 
-###Driving Cycles Tab
-
-
-Driving Cycle List
-:   The Driving Cycles List is only used in [Batch Mode](#batch-mode). The same controls are used as in the Job Files List.
-
 
 ###Options Tab
 
@@ -74,27 +67,9 @@ In this tab the global calculation settings can be changed.
 ![cb](pics/checkbox.png) Write modal results
 :   Toggle output of modal results (.vmod files). Summary files (.vsum, .vres) are always created.
 
-<div class="vecto2">
-![](pics/checkbox.png) Batch Mode
-:   If Declaration Mode is disabled VECTO can be run in [Batch Mode](#batch-mode).
-
-![cb](pics/checkbox.png) Cycle Distance Correction
-:   Toggle Cycle Distance Correction. Always ON in Declaration Mode. Cycle Distance Correction monitors the driven distance in each time step and, if necessary, adds or removes time steps in order to keep the original distance given in the driving cycle.
-:   -   If **enabled** the vehicle drives the same **distance** as given in the driving cycle
--   If ***disabled*** the vehicle travels the same **time** as given in the driving cycle (Note that distance-based cycles (see [here](#driving-cycles)) are always converted to time-based cycles internally)
-
-![cb](pics/checkbox.png) Use gears/rpm's form driving cycle
-:   If activated VECTO will use gear and/or engine speed defintions included in the driving cycle (see [here](#driving-cycles)).
-
-![cb](pics/checkbox.png) Shutdown system after last job
-:   If activated VECTO will shutdown the system after the last job was completed. (Can be aborted during 100 seconds before shutdown.)
-
-Output Path (BATCH Mode only)
-:   Select target directory for result files (.vmod, .vres, .vsum)
+![cb](pics/checkbox.png) Modal results in 1Hz
+:   If selected, the modal results (.vmod file) will be converted into 1Hz after the simulation.
 
-![cb](pics/checkbox.png) Create Subdirectories for modal results (BATCH Mode only)
-:   If activated a subdirectory for each job file will be created inside **Output Path** for modal output.
-</div>
 
 ###Controls
 
@@ -143,9 +118,7 @@ Depending on the colour the following message types are displayed:
 
 Note that the [message log](#application-files) can be opened in the ![](pics/Misc-Tools-icon.png) Tools menu with **Open Log**.
 
-<div class="vecto3">
-In addition to the log messages shown in the message list, Vecto 3 writes more elaborate messages in the subdirectory logs. If multiple simulations are run in parallel (e.g., in declartion mode a vehicle is simulated on different cycles with different loadings) a separate log-file is created for every simulation run.
-</div>
+In addition to the log messages shown in the message list, Vecto writes more elaborate messages in the subdirectory logs. If multiple simulations are run in parallel (e.g., in declartion mode a vehicle is simulated on different cycles with different loadings) a separate log-file is created for every simulation run.
 
 Statusbar
 : Displays current status and progress of active simulations. When no simulation is executed the current mode is displayed (Standard, Batch or Declaration Mode).
diff --git a/Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md b/Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md
index 4289b809109a96badd5511c080ff36ebb95ec950..84daf277953b6b3eb4e2a4f0ebd3424d79300a4a 100644
--- a/Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md	
@@ -13,7 +13,7 @@ The [job file (.vecto)](#job-file) includes all informations to run a VECTO calc
 -   Filepath ot the [Gearbox File (.vgbx)](#gearbox-editor) which defines gear ratios and transmission losses
 -   Auxiliaries
 -   Driver Assist parameters
--   Driving Cycles (not used in Batch Mode)
+-   Driving Cycles (only in Engineering Mode)
 
 
 ###Relative File Paths
@@ -42,14 +42,27 @@ Filepath to the Engine File (.veng)
 Filepath ot the Gearbox File(.vgbx)
 :	Files can be created and edited using the [Gearbox Editor](#gearbox-editor).
 
+<div class="declaration">
 Auxiliaries
-:	This list contains all auxiliaries used for calculation. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). 
-In Declaration Mode the set of auxiliaries and their power-demand is pre-defined, depending on the vehicle category and driving cycle. 
-In Engineering Mode the set of auxiliaries can be freely defined. For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles) must include the corresponding supply power.
+:	This group contains input elements to define the vehicle's load from the auxiliaries.
+In Declaration Mode only the pre-defined auxiliaries are available and their power-demand is also pre-defined, depending on the vehicle category and driving cycle. This means the Auxiliary Type is set to 'Classic: Vecto Auxiliary' and no 'Constant Aux Load' can be specified.
+The following list contains the pre-defined auxiliaries where the concrete technology for each auxiliary can be configured using the [Auxiliary Dialog](#auxiliary-dialog). 
 **Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
+</div>
+
+<div class="engineering">
+Auxiliaries
+:	In Engineering Mode the set of auxiliaries can be freely defined.
+First, the Auxiliary Type can be selected. If the Bus Auxiliaries are selected a configuration file for the Advanced Auxiliaries has to be specified. When using the Bus Auxiliaries, the standard auxiliaries can  be added as well in the list below to take into account the steering pump, etc.
+The 'Constant Aux Load' can be used to define a constant power demand from the auxiliaries (similar to P_add in the driving cycle, but constant over the whole cycle).
+The following list can be used to define the auxiliary load in more detail via a separate input file. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). 
+ For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles) must include the corresponding supply power.
+**Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
+
 
 : ![addaux](pics/plus-circle-icon.png) Add new Auxiliary
 : ![remaux](pics/minus-circle-icon.png) Remove the selected Auxiliary from the list
+</div>
 
 : See [Auxiliaries](#auxiliaries) for details.
 
@@ -81,7 +94,7 @@ Acceleration Limiting
 
 ###Chart Area
 
-If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file) and [Gearbox File](#gearbox-file) is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and shift polygons. In [Declaration Mode](#declaration-mode) the **generic**  shift polygons are shown, not the ones from the Gearbox File.
+If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file) and [Gearbox File](#gearbox-file) is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map. 
 
 ###Controls
 
diff --git a/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md b/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
index 88fc6ee36abbd652ac6e6013768e2162e8c4b338..ae2a64842a549fd78acea068e9e7ef047f9c2c15 100644
--- a/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md	
+++ b/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md	
@@ -1,18 +1,24 @@
 ##Auxiliary Dialog
 
+<div class="declaration">
+
+</div>
 
+<div class="engineering">
 ![](pics/VECTO-Editor_Aux.png)
+</div>
 
 ###Description
 
 
-The Auxiliary Dialog is used to configure auxiliaries. In [Declaration Mode](#declaration-mode) the set of auxiliaries and their power demand is pre-defined. The user has to select for every auxiliary the technology from a given list. In [Engineering Mode](#engineering-mode) the set of auxiliaries can be specified by the user. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
+The Auxiliary Dialog is used to configure auxiliaries. In [Declaration Mode](#declaration-mode) the set of auxiliaries and their power demand is pre-defined. For every auxiliary the user has to select the technology from a given list. In [Engineering Mode](#engineering-mode) the set of auxiliaries can be specified by the user. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
 
 ###Settings
 
 <div class="declaration">
 Technology
-:   List of available technology for the auxiliary type (declaration mode)
+:   List of available technology for the auxiliary type
+For the  steering pump multiple technologies can be defined, one for each steered axle.
 </div>
 
 <div class="engineering">
@@ -28,6 +34,8 @@ Input File
 :	Path to the [Auxiliary File (.vaux)](#auxiliary-input-file-.vaux).
 </div>
 
+
+
 ###Controls
 
 
diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index d9e2bb73119ffa568fbcb4fd46f2b1fe4125e877..3ca2e1c8e5cc7111ae63092f27c519d5e8950434 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
@@ -29,47 +29,71 @@ HDV Class
 
 ###Weight/Loading
 
-These fields define the weight and loading of the vehicle. **Max. Loading** displays the maximum possible loading for the selected vehicle depending on curb weight and GVW values.
+Curb Weight Vehicle
+: Specifies the vehicle's weight without loading
 
-***Note:*** *VECTO uses the sum of* ***Curb Weight Vehicle, Curb Weight Extra Trailer/Body*** *and* ***Loading*** *for calculation!*
+<div class="engineering">
+Curb Weight Extra Trailer/Body
+: Specifies additional weight due to superstructures on the vehicle or an additional trailer
 
-###Air Resistance
+Loading
+: Speciefies the loading of both, the vehicle and if available the trailer
+</div>
 
-The product of Drag Coefficient [-] and Cross Sectional Area [m²] (**c~d~ x A**) and **Air Density** [kg/m³] (see [Settings](#settings)) together with the vehicle speed defines the Air Resistance. Note that the Air Drag depends on the chosen [**Cross Wind Correction**](#cross-wind-correction).
+**Max. Loading** displays a hint for the maximum possible loading for the selected vehicle depending on curb weight and GVW values (without taking into account the loading capacity of an additional trailer).
 
+***Note:*** *VECTO uses the sum of* ***Curb Weight Vehicle, Curb Weight Extra Trailer/Body*** *and* ***Loading*** *for calculation! The total weight is distributed to all defined axles according to the relative weight share.*
 
-###Dynamic Tyre Radius
+<div class="declaration">
+In Declaration Mode only the vehicle itself needs to be specified. Depending on the vehicle category and mission the simulation adds a standard trailer for certain missions.
+</div>
 
-In [Engineering Mode](#engineering-mode) this defines the effective (dynamic) wheel radius (in [mm]) used to calculate engine speed. In [Declaration Mode](#declaration-mode) the radius calculated automatically using tyres/rims of the powered axle.
+###Air Resistance and Corss Wind Correction Options
 
+The product of Drag Coefficient [-] and Cross Sectional Area [m²] (**c~d~ x A**) and **Air Density** [kg/m³] (see [Settings](#settings)) together with the vehicle speed defines the Air Resistance. Vecto uses the combined value **c~d x A** as input. 
+**Note that the Air Drag depends on the chosen [**Cross Wind Correction**](#cross-wind-correction).**
 
-###Cross Wind Correction Options
+<div class="declaration">
+If the vehicle has attached a trailer for simulating certain missions the given **c~d~ x A** value is increased by a fixed amount depending on the trailer used for the given vehicle category.
+</div>
 
-Four different options are available:
+For cross wind correction four different options are available:
 : -  No Correction: The specified CdxA value is used to compute the air drag, no cross-wind correction is applied
 -  Speed dependent (User-defined): The specified CdxA value is corrected depending on the vehicle's speed.
 -  Speed dependent (Declaration Mode): A uniformly distributed cross-wind is assumed and used for correcting the air-drag depending on the vehicle's speed
 -  Vair & Beta Input: Correction mode if the actual wind speed and wind angle relative to the vehicle have been measured.
 
+<div class="declaration">
 In delcaration mode the 'Speed dependent (Declaration Mode)' cross-wind correction is used.
+</div>
 
 Depending on the chosen mode either a [Speed Dependent Cross Wind Correction Input File (.vcdv)](#speed-dependent-cross-wind-correction-input-file-.vcdv) or a [Vair & Beta Cross Wind Correction Input File (.vcdb)](#speed-dependent-cross-wind-correction-input-file-.vcdv) must be defined. For details see [Cross Wind Correction](#cross-wind-correction).
 
+###Dynamic Tyre Radius
+
+In [Engineering Mode](#engineering-mode) this defines the effective (dynamic) wheel radius (in [mm]) used to calculate engine speed. In [Declaration Mode](#declaration-mode) the radius calculated automatically using tyres of the powered axle.
+
 
 ###Axles/Wheels
 
 For each axle the parameters **Relative axle load, RRC~ISO~** and **F~zISO~** have to be given in order to calculate the total [Rolling Resistance Coefficient](#rolling-resistance-coefficient).
-Furthermore the **Wheels Inertia [kgm²]** has to be set per wheel for each axle. In [Declaration Mode](#declaration-mode) the inertia is computed based on the selected tyres and rims. The number of axles specified have to match the vehicle type (e.g., 2 axles for a 4x2 truck).
 
-<div class="declaration">
-In [Declaration mode](#declaration-mode) only the axles of the truck have to be given. For the trailer predefined wheels and weight-shares are used.
+<div class="engineering">
+In Engineering mode, the **Wheels Inertia [kgm²]** has to be set per wheel for each axle.
+The axles, for both  truck and trailer, have to be given.
+
+Use the ![](pics/plus-circle-icon.png) and ![](pics/minus-circle-icon.png) buttons to add or remove axles form the vehicle. 
+
 </div>
 
-<div class="engineering">
-In [Engineering Mode](#engineering-mode) all axles, for both  truck and trailer, have to be given.
+<div class="declaration">
+In [Declaration mode](#declaration-mode) only the axles of the truck have to be given (e.g., 2 axles for a 4x2 truck). 
+The dynamic tyre radius is derived from the second axle as it is assumed this is the driven axle.
+For missions with a trailer predefined wheels and weight-shares are added by Vecto automatically.
 </div>
 
-Use the ![](pics/plus-circle-icon.png) and ![](pics/minus-circle-icon.png) buttons to add or remove axles form the vehicle. Doubleclick entries to edit existing axle configurations.
+Doubleclick entries to edit existing axle configurations.
+
 
 ###Retarder Losses
 
@@ -83,6 +107,7 @@ Four options are available:
 
 Both, primary and secondary retarders, require an [Retarder Torque Loss Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
 
+The Retarder Ratio defines the ratio between the engine speed/cardan shaft speed and the retarder.
 
 ###Angledrive
 
@@ -90,7 +115,7 @@ If an angledrive is used in the vehicle, it can be defined here.
 Three options are available:
 
 - None (**default**)
-- Separate Angledrive: Use this if the angledrive is measured separately. In this case the ratio must be set and the [Transmission Loss Map](#transmission-loss-map) (or an Efficiency value) must also be given.
+- Separate Angledrive: Use this if the angledrive is measured separately. In this case the ratio must be set and the [Transmission Loss Map](#transmission-loss-map) (or an Efficiency value in Engineering mode) must also be given.
 - Included in transmission: Use this if the gearbox already includes the transmission losses for the angledrive in the respective transmission loss maps.
 
 
diff --git a/Documentation/User Manual/1-user-interface/G_ENG-Editor.md b/Documentation/User Manual/1-user-interface/G_ENG-Editor.md
index c32e7a4af819dbe189670d19f70dc359614f89ea..8f8b1d8a47943ea0b20afc2fbe77ed06270419e0 100644
--- a/Documentation/User Manual/1-user-interface/G_ENG-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/G_ENG-Editor.md	
@@ -25,7 +25,7 @@ Displacement \[ccm\]
 :   Used in [Declaration Mode](#declaration-mode) to calculate inertia.
 
 Inertia including Flywheel \[kgm²\]
-:   Inertia for rotating parts including engine flywheel. In [Declaration Mode](#declaration-mode) the inertia is calculated automatically depending on the engine's displacement and also accounts for the clutch's inertia.
+:   Inertia for rotating parts including engine flywheel. In [Declaration Mode](#declaration-mode) the inertia is calculated  depending on the engine's displacement and also accounts for the clutch's inertia.
 
 ###Full Load and Drag Curves
 
@@ -41,9 +41,16 @@ The input file (.vmap) file format is described [here](#fuel-consumption-map-.vm
 
 ###WHTC Correction Factors
 
-
+<div class="declaration">
 The WHTC Correction Factors are required in [Declaration Mode](#declaration-mode) for the [WHTC FC Correction](#fuel-consumption-calculation).
 
+The Cold/Hot Emission Balancing Factor is an additional correction factor that is used to correct the fuel consumption.
+</div>
+
+<div class="engineering">
+In engineering a single correction factor for correcting WHTC, Cold/Hot Balancing, ... can be specified. 
+</div>
+
 
 ###Chart Area
 
diff --git a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
index a314103cf7d1b5a2c1addc6f829abf37599cfacf..5e74733f6cf8586f1073b66b552beca39d455c98 100644
--- a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md	
@@ -30,11 +30,13 @@ Transmission Type
 :   Depending on the transmission type some options below are not available. The following types are available:
 :   -   **MT**: Manual Transmission
 -   **AMT**: Automated Manual Transmission
--   **AT**: Automatic Transmission
--   **Custom**
+-   **AT-S**: Automatic Transmission - Serial
+-   **AT-P** : Automatic Transmission - Power Split
 :	Note: The types AT and Custom are not available in [Declaration Mode](#declaration-mode).
 
 
+For more details on the automatic transmission please see the [AT-Model](#AT-model)
+
 Inertia \[kgm²\]
 :   Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
 
@@ -47,65 +49,59 @@ Traction Interruption \[s\]
 
 Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.png) buttons to add or remove gears from the vehicle. Doubleclick entries to edit existing gears.
 
--   Gear **"A"** defines the ratio of the axle transmission / differential.
--    **"TC"** (AT only) defines which gears are using the torque converter (lock-up clutch open).
+-   Gear **"Axle"** defines the ratio of the axle transmission / differential.
 -    **"Ratio"** defines the ratio between the output speed and input speed for the current gear. Must be greater than 0.
--    **"Loss Map or Efficiency"** allows to define either a constant efficiency value or a [loss map (.vtlm)](#transmission-loss-map). <span class="vecto3">Note: in Vecto 3 it is mandatory to specify a loss map for every gear!</span>
--    **"Shift polygons"** defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) for each gear. Not required in [Declaration Mode](#declaration-mode). See [GearShift Model](#gear-shift-model) for details.
--	 **"Full Load Curves"** defines the [Full Load Curve for (.vfld)](#full-load-and-drag-curves-.vfld) each gear. It is used for torque limiting in the current gear. Note: in Declaration mode the [generic shift polygons](#gear-shift-model) are computed from the engine's full-load curve. If the maximum torque is limited by the gearbox, the minimum of the gearbox and engine maximum torque will be used to compute the [generic shift polygons](#gear-shift-model)!
-
+-    **"Loss Map or Efficiency"** allows to define either a constant efficiency value or a [loss map (.vtlm)](#transmission-loss-map). <span class="engineering">Note: efficiency values are only allowed in engineering mode</span>
+-    **"Shift polygons"** defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) for each gear. Not allowed in [Declaration Mode](#declaration-mode). See [GearShift Model](#gear-shift-model) for details.
+-	 **"Max Torque"** defines the maximum allowed torque (if applicable) for ah gear. It is used for limiting the engine's torque in certain gear. Note: in Declaration mode the [generic shift polygons](#gear-shift-model) are computed from the engine's full-load curve. If the maximum torque is limited by the gearbox, the minimum of the gearbox and engine maximum torque will be used to compute the [generic shift polygons](#gear-shift-model)!
 
-###Gear shift parameters
 
+###Gear shift strategy parameters
 
-![](pics/checkbox.png) Allow shift-up inside polygons
-:   See [Gear Shift Model](#gear-shift-model).
+Since version Vecto 3.0.3 the gearshift polygon calculation according to the ACEA White Book 2016 is implemented and since Vecto 3.0.4 the ACEA White Book 2016 shift strategy for AMT and MT is implemented. For details on this topic please see the ACEA White Book 2016.
 
-![](pics/checkbox.png) Skip Gears
-:   See [Gear Shift Model](#gear-shift-model).
+![](pics/Vecto_ShiftStrategyParameters.png)
 
-<div class="vecto3">
-Since version Vecto 3.0.3 the gearshift polygon calculation according to the ACEA White Book 2016 is implemented and since Vecto 3.0.4 the ACEA White Book 2016 shift strategy for AMT and MT is implemented. For details on this topic please see the ACEA White Book 2016.
 
+<div class="engineering">
 The user interface contains input fields for the following parameters:
-! - **Downshift after upshift delay**: to prevent frequent (oscilating) up-/down shifts this parameter blocks downshifts for a certain period after an upshift
+: - **Downshift after upshift delay**: to prevent frequent (oscilating) up-/down shifts this parameter blocks downshifts for a certain period after an upshift
 - **Upshift after downshift delay**: to prevent frequent (oscilating) up-/down shifts this parameter blocks upshifts for a certain period after a downshift
 - **Min acceleration after upshift**: after an upshift the vehicle must be able to accelerate with at least the given acceleration. The achievable acceleration after an upshift is estimated on the current driving condition and powertrain state.
 
-![](pics/Vecto_ShiftStrategyParameters.png)
-
-</div>
-
 Torque Reserve \[%\]
 :   This parameter is required for the **Allow shift-up inside polygons** and **Skip Gears** options.
 
 
 Minimum shift time \[s\]
-:   Limits the time between two gear shifts. This rule will be ignored if rpms are too high or too low. <span class="vecto2">Vecto 2.2 uses fixed time-steps of 1 second, hence only whole seconds can be specified.</span>
-<span class="vecto3">Vecto 3 uses dynamic time-steps, hence any values greater than 0 seconds can be given.</span>
+:   Limits the time between two gear shifts. This rule will be ignored if rpms are too high or too low. 
 
 
 Start Gear
 :   In order to calculate an appropriate gear for vehicle start (first gear after vehicle standstill) a fictional load case is calculated using a specified **reference vehicle speed** and **reference acceleration** together with the actual road gradient, transmission losses and auxiliary power demand. This way the start gear is independent from the target speed. VECTO uses the highest possible gear which provides the defined **torque reserve**.
-
-
-###Chart Area
-
-
-
-The Chart Area displays the [Shift Polygons Input File(.vgbs)](#shift-polygons-input-file-.vgbs) for the selected gear.
+</div>
 
 
 ###Torque Converter
 
-<div class="vecto2">
+Torque converter characteristics file
+:   Defines the [Torque converter characteristics file](#torque-converter-characteristics-.vtcc) containing the torque ratio and reference torque over the speed ratio.
 
-The [Torque Converter Model](#torque-converter-model) is still in development.
+Reference RPM
+:   Defines the reference speed at which the torque converter characteristics file was measured.
 
 Inertia \[kgm²\]
 :   Rotational inertia of the engine-side part of the torque converter.
 (Gearbox-side inertia is not considered in VECTO.)
 
+Torque converter shift polygon
+:   Defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) separately for the torque converter. For details on shifting from/to the torque converter gear please see [AT Gear Shift Strategy](#at-gear-shift-strategy).
+
+
+###Chart Area
+
+The Chart Area displays the [Shift Polygons Input File(.vgbs)](#shift-polygons-input-file-.vgbs) as well as the declaration mode shift polygons (dashed lines) for the selected gear.
+
 
 ###Controls
 
diff --git a/Documentation/User Manual/1-user-interface/J_cmd.md b/Documentation/User Manual/1-user-interface/J_cmd.md
deleted file mode 100644
index d37a6edfa426402d3a9740d9edf2241b14d52f6f..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/J_cmd.md	
+++ /dev/null
@@ -1,41 +0,0 @@
-##Command Line Arguments
-
-![](pics/cmd.png)
-
-It is possible to control basic functions of VECTO via command line arguments (e.g. to automate calculations and results analysis using scripts).
-
-###General Notes
-
--   The order in which the arguments are provided is free.
--   If a file path includes space characters (e.g. "C:\\VECTO Test Files\\Demo.vecto") then double quotes have to be used (as in the picture above).
--   If not the complete file path is defined (e.g. "file1.vecto" instead of "c:\\data\\file1.vecto") then VECTO expects the file in the application directory (where VECTO.exe is located).
--   In the instructions below square brackets "\[  \]" indicate optional arguments.
-
-
-
-###Standard Mode
-
-        VECTO.exe -run \[-close\] \[file1.vecto file2.vecto ... fileN.vecto\]
-
-
-Runs calculation(s) either with the provided .vecto file(s) or (if no file names are defined) with the files already loaded on start up\*. If -**close** is used then VECTO closes after calculations are done.
-
-
-###Batch Mode
-
-		VECTO.exe -run -batch \[-close\] \[file1.vecto file2.vecto ... fileN.vecto\] \[cycle1.vdri cycle2.vdri ... cycleN.vdri\]
-
-
-
- Switches to BATCH mode and runs with the provided .vecto and .vdri files. If no files are defined the pre-loaded files\* are used. If -**close** is used then VECTO closes after calculations are done.
-
-
-###Opening files
-
-		VECTO.exe file1.xxx
-
-
-If the file has one of the following extensions it is opened with the associated editor dialog: .vecto, .vgbx, .veng, .vveh. Note: if more than one .vecto file is provided they will be loaded in the file list (replacing the pre-loaded list\*) instead.
-
-
- *pre-loaded files: When VECTO starts it loads the file lists (.vecto, .vdri) of the last session, see [Application Files](#application-files). These files can be changes manually if VECTO is not running.
diff --git a/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md b/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md
index e178f054f640066ffb05b8ea2c3ad16a5b441e12..b3f70bda7bab575a21868ecccf9524277e643c7b 100644
--- a/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md	
+++ b/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md	
@@ -28,7 +28,7 @@ The Advance Auxiliaries Editor contains four tabs/sub-modules where the differen
 
 ###Important notes
 
-Note that the cycle file name used should ideally respect the following syntax to be correctly associated with the pneumatic actuations map (.apac), otherwise the number of actuations will be set at 0 by default:
+Note that the cycle file name used should ideally respect the following syntax to be correctly associated with the pneumatic actuations map (.apac), otherwise the number of actuations will be set to 0 by default:
 
 -   "AnyOtherText _X_Bus.vdri", with "X" = "Urban", "Heavy urban", “Suburban", or "Interurban"
 -   "AnyOtherText_Coach.vdri"
diff --git a/Documentation/User Manual/2-calculation-modes/batch.md b/Documentation/User Manual/2-calculation-modes/batch.md
deleted file mode 100644
index 71b715a171998e03724527fcce864c8bf5a53950..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/2-calculation-modes/batch.md	
+++ /dev/null
@@ -1,22 +0,0 @@
-##Batch Mode
-
-<div class="vecto2">
-
-In Batch Mode a list of vehicles is run with a list of driving cycles. Each vehicle defined in the Job List is calculated with each driving cycle defined in the Driving Cycle List. Note that the Driving Cycle List is only visible if Batch Mode is enabled in the Main Form / Options Tab.
-
-###Requirements
-
--   One or more checked job files in the Job List. The job files don't need to include driving cycles. These are ignored in Batch mode.
--   One or more checked driving cycles in the Dricing Cycle List
-
-###Results
-
--   Modal results (.vmod) for each job file and driving cycle. One file for each vehicle/cycle combination.
--   Average/sum results (.vsum / .vsum.json). One file in total containing results for each vehicle/cycle combination.
-
-</div>
-
-<div class="vecto3">
-VECTO V3.x doesn't support Batch mode anymore. The same functionality can be achieved by referencing every needed cycle file in the job files.
-</div>
-
diff --git a/Documentation/User Manual/2-calculation-modes/calculation-modes.md b/Documentation/User Manual/2-calculation-modes/calculation-modes.md
index ba8d8f1589739b7bdae17bfcb1c5755651b3142e..1470a6a08ef289981dad68318dd4a7d08a75fcce 100644
--- a/Documentation/User Manual/2-calculation-modes/calculation-modes.md	
+++ b/Documentation/User Manual/2-calculation-modes/calculation-modes.md	
@@ -14,15 +14,4 @@ VECTO supports different calculation modes for declaring a vehicle, validation o
 
 In the GUI the Calculation Mode can be changed via the Options Tab of the [Main Form](#main-form).
 
-In the Command Line the Calculation Mode is Declaration by default, but can be changed to Engineering with the "-eng" flag.
-
-<div class="vecto2">
-A so called [Batch Mode](#batch-mode) exists in VECTO v2.2, which simulates every given job file with every given cycle file. This has nothing to do with the command line, it is just a convenience function to combine job files and cycle files.
-</div>
-
-<div class="vecto3">
-VECTO V3.x doesn't support Batch mode anymore. The same functionality can be achieved by referencing every needed cycle file in the job files.
-</div>
-
-
-
+In the Command Line the default Calculation Mode is Declaration, but can be changed to Engineering with the "-eng" flag.
diff --git a/Documentation/User Manual/2-calculation-modes/engineering.md b/Documentation/User Manual/2-calculation-modes/engineering.md
index c11b94742d4cbd95020d1f1099bd087e5fb1def0..75243814b10432440d99846f6948772dbb88087e 100644
--- a/Documentation/User Manual/2-calculation-modes/engineering.md	
+++ b/Documentation/User Manual/2-calculation-modes/engineering.md	
@@ -1,15 +1,9 @@
 ##Engineering Mode
 
-The Engineering Mode lets the user define every aspect in the components of the vehicle and the driving cycle. This is for experimenting and validation purposes.
+The Engineering Mode lets the user define every aspect in the component models of the vehicle and the driving cycle. This is for experimenting and validation purposes.
 
 In this mode the given list of job files is simulated with the respective driving cycles. Each job file defines a separate vehicle.
 
-<div class="vecto2">
-This is the default calculation mode in VECTO V2.
-</div>
-<div class="vecto3">
-In VectoCMD V3.x the default mode is Declaration Mode.
-</div>
 
 ###Requirements
 
@@ -18,7 +12,7 @@ In VectoCMD V3.x the default mode is Declaration Mode.
 
 ###Results
 
--   Modal results (.vmod). One file for each vehicle/cycle combination.
+-   Modal results (.vmod). One file for each vehicle/cycle combination. Modal results are only written if the modal output is enabled in the 'Options' tab on the [Main Window](#main-form)
 -   Sum results (.vsum). One file for each invocation of VECTO.
 
 
@@ -34,7 +28,4 @@ The Driving Cycle determines the simulation method in engineering mode. The opti
 * [Pwheel (SiCo) Mode, time-based](#engineering-mode-pwheel-sico-time-based)
 :   In Pwheel mode the measured power at the wheels is given, and the simulation takes that as input.
 
-
-
-
-
+**Note:** Time-based driving cycles support arbitrary time steps. However, certain actions are simulated within a single simulation interval (e.g. closing the clutch after a gear switch) and may thus result in artefacts during the simulation due to engine inertia, gearbox inertia, etc. Thus **the suggested minimum time interval for time-based cycles is 0.5s!**
diff --git a/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md b/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
index 02e23f197cba5613da69f09c636e3f82bd527808..4324eb063a3955466713641d797402b094566e8d 100644
--- a/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md	
+++ b/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md	
@@ -23,15 +23,5 @@ Parameters in [Job File](#job-file):
 
 ###Eco-Roll
 
-<div class="vecto2">
-Instead of using the engine brake (with no fuel consumption) Eco-Roll shifts to Neutral, engine idling, to minimize deceleration and maximize the vehicle's roll out distance. During this phase the engine has to overcome its own idling losses and the power demand from the auxiliaries. The engine is engaged again if the speed exceeds the speed limits defined by Max. Over-/Underspeed.
+Eco-Roll is not implemented in Vecto 3.1.
 
- ![](pics/EcoRoll.svg)
-
-*Example of Eco-Roll. Target (purple) and actual speed (orange) on the top left axis, slope (brown) on the top right axis. The bottom graph shows engine power (blue), motoring curve (orange) and mechanical brake power (green). The engine is idling while the vehicle rolls freely and braking when the upper speed limit is reached.*
-
-Parameters in [Job File](#job-file):
-: -   **Minimum speed \[km/h\]** Below this speed the function is disabled.
--   **Max. Overspeed \[km/h\]** (relative to target speed)
--   **Max. Underspeed \[km/h\]** (relative to target speed)
-</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/Auxiliaries.md b/Documentation/User Manual/3-simulation-models/Auxiliaries.md
index 3243618de067a05c5cd35c9dbb5304abbe1e8227..b1b06e767722361b7cf6798f976bed9b82de7f86 100644
--- a/Documentation/User Manual/3-simulation-models/Auxiliaries.md	
+++ b/Documentation/User Manual/3-simulation-models/Auxiliaries.md	
@@ -1,8 +1,11 @@
 ##Auxiliaries
 
+<div class="declaration">
+In Declaration mode the auxiliaries are pre-defined and the power demand is defined based on the vehicle category and mission. For every type of auxiliary (fan, steering pump, HVAC, electrig system, pneumatic system) the user can select a technology from a given list.
+</div>
 
-
-In VECTO a generic map-based approach was implemented to consider all types of auxiliaries. The supply power demand for each single auxiliary is defined in the driving cycle. Hence a time/distance-dependent power demand can be defined. Based on the supply power and a pre-defined efficiency map the auxiliary input power is calculated. A constant efficiency determines the losses between auxiliary and engine.
+<div class="engineering">
+In Engineering mode VECTO uses a generic map-based approach to consider all types of auxiliaries. The supply power demand for each single auxiliary is defined in the driving cycle. Hence a time/distance-dependent power demand can be defined. Based on the supply power and a pre-defined efficiency map the auxiliary input power is calculated. A constant efficiency determines the losses between auxiliary and engine.
 
 For each auxiliary the power demand is calculated using the following steps:
 
@@ -18,7 +21,7 @@ For each auxiliary the power demand is calculated using the following steps:
 
 5.  **P~aux~ is added to the engine's power demand**
 
-
+6.  **P~supply~ is defined in the driving cycle
 
 
 |            |                                                                                                       |                                 |  
@@ -38,9 +41,11 @@ For each auxiliary the power demand is calculated using the following steps:
 
 
 
+Each auxiliary must be defined in the [Job File](#job-file) and each [driving cycle](#driving-cycles) used with this vehicle/auxiliary must include supply power for each auxiliary. To link the supply power in the driving cycle to the correct auxiliary in the Job File an ID is used. The corresponding supply power is then named *"&lt;Aux\_ID&gt;"*.
 
 
-Each auxiliary must be defined in the [Job File](#job-file) and each [driving cycle](#driving-cycles) used with this vehicle must include supply power for each auxiliary. To link the supply power in the driving cycle to the correct auxiliary in the Job File an ID is used. The corresponding supply power is then named *"&lt;Aux\_ID&gt;"*.
+***Example:*** *The Auxiliary with the ID "ALT" (in the Job File) is linked to the supply power in the column "&lt;Aux\_ALT&gt;" in the driving cylce.*
 
+In addition to the generic map-based auxiliaries approach it is also possible to specify a constant load applied to the engine during the whole mission.
 
-***Example:*** *The Auxiliary with the ID "ALT" (in the Job File) is linked to the supply power in the column "&lt;Aux\_ALT&gt;" in the driving cylce.*
+</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md b/Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md
index 86593c728d0bfef058e2721398ca83412c32e2fa..4407f8cb4f1ee3e8ee2ece47f267187b21cc6f0e 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md	
@@ -1,10 +1,6 @@
 ##Engine: Transient Full Load
 
-The engine implements a PT1 behaviour to model transient torque build up.
-
-<div class="vecto2">
-VECTO 2 uses a PT1 function to model transient torque build up using this formula:
-
+The engine implements a PT1 behaviour to model transient torque build up:
 
 $P_{fld\ dyn_{i}} = \frac{1}{T(n_{i})+1} \cdot \left(P_{fld\ stat}(n_{i})+T(n_{i}) \cdot P_{act_{i-1}}\right)$
 
@@ -14,9 +10,8 @@ with:
 * T(n~i~) ... PT1 time constant at engine speed n~i~ (col. 4 in [.vfld file](#full-load-and-drag-curves-.vfld))
 * P~fld\ stat~(n~i~) ... Static full load at engine speed n~i~ (col. 2 in [.vfld file](#full-load-and-drag-curves-.vfld))
 * P~act\ i-1~ ... Engine power in previous time step
-</div>
 
-<div class="vecto3">
+
 Vecto 3 uses basically the same PT1 behavior to model transient torque build up. However, due to the dynamic time steps the formula is implemented as follows:
 
 $P_{fld\ dyn_{i}} = P_{fld\ stat}(n_i) \cdot \left(1 - e^{-\frac{t_i^*}{\mathit{PT1}}}\right)$
@@ -29,5 +24,3 @@ $t_{i-1}^* = \mathit{PT1} \cdot ln\left(\frac{1}{1 - \frac{P_{eng_{i - 1}}}{P_{f
 
 
 
-</div>
-
diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC.md b/Documentation/User Manual/3-simulation-models/Engine_FC.md
index 2e0df3e109a61278e5f1206e5448d0bdc26ba688..c19ae4371389028dbf29b5764c0ea8b63e3c3b8f 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC.md	
@@ -25,15 +25,5 @@ The interpolation is based on [Delaunay Triangulation ![](pics/external-icon%20
 *Delaunay Triangulation Example*
 
 
-###Auxiliary - Start/Stop Correction
 
-<div class="vecto2">
-For vehicles with [Start/Stop](#engine-startstop) the fuel consumption needs to be corrected to consider the wrong auxiliary energy balance caused by engine stops because VECTO uses a constant power demand for auxiliaries for the whole mission profile. The correction consists of the following steps:
-
-1.  From all 1Hz data points of the VECTO simulation, a linear regression curve (y=k\*x+d) for fuel consumption (unit: grams per hour) over engine power (unit: kilo-watt) is calculated (see figure below).
-2.  From the difference between the energy consumed by the auxiliaries in the simulation with Start/Stop function and the target value (unit kilowatt-hours), a cycle average change in mechanical power “ΔPe” (unit kilowatt) of the internal combustion engine is calculated (using an average alternator efficiency and the cycle time with running engine).
-3.  The correction of the fuel consumption is performed for all 1Hz time steps using: ΔFC (unit: grams per hour) = ΔPe \* k where k = gradient in the regression. If the engine is running in motoring conditions ΔFC is set to zero.
-
-![Example of a linear regression between engine power and fuel consumption](pics/StartStopCorrection.svg)
-</div>
 
diff --git a/Documentation/User Manual/3-simulation-models/Engine_StartStop.md b/Documentation/User Manual/3-simulation-models/Engine_StartStop.md
index fdf369745a15d8dd8d03ca629cf72f859f89b4e8..fbfa8395a821fa208fe3882033eaadf58215dd3d 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_StartStop.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_StartStop.md	
@@ -1,19 +1,3 @@
 ##Engine Start/Stop
 
-<div class="vecto2">
-
-If enabled the engine will be turned off after the set **Activation Delay \[s\] **if the following conditions apply:
-
--   Power demand ≤ 0
--   Vehicle speed is below **Max Speed \[km/h\]**
--   Engine was running for at least **Min ICE-On Time \[s\]**
-
-**Parameters in [Job File](#job-file):**
-
--   **Max speed \[km/h\]**.
--   **Min ICE-On Time \[s\]**
--   **Activation Delay \[s\]**
-
-If Start/Stop is enabled the fuel consumption is corrected for not-considered auxiliary energy consumption during engine stop. See [Start/Stop FC Correction](#fuel-consumption-calculation).
-
-</div>
\ No newline at end of file
+Eco-Roll is not implemented in Vecto 3.1.
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/Engine_WHTC.md b/Documentation/User Manual/3-simulation-models/Engine_WHTC.md
index 0c5cf1c434dcac1057159924f63f3b49f6f93c1a..5e4c0cc95627a9f08dddc3c5f3013f44ef031ce2 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_WHTC.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_WHTC.md	
@@ -26,10 +26,13 @@ with the correction factor CF~urb~, CF~rur~, CF~mot~ coming from the [Engine](#e
 | Interurban bus     | 45%     | 36%     | 19%     |
 | Coach              | 0%      | 22%     | 78%     |
 
-The whtc fuel consumption is then calculated with: $FC_{whtc} = FC \cdot CF_{total}$
+In order to balance the trade-off between emissions and fuel consumption during cold and hot starting conditions an additional balancing factor $CF_{C/H}$ is determined from the overall specific fuel consumption over the cold start and hot start WHTC test. This value is part of the output from the engine component tool.
+
+The WHTC-corrected fuel consumption is then calculated with: $FC_{whtc} = FC \cdot CF_{total} \cdot CF_{C/H}$
 </div>
 
 <div class="engineering">
-In engineering mode no WHTC correction is applied by Vecto. For an arbitrary cycle the weighting factors are not known, hence the total correction factor CF~total~ can not be computed.
-WHTC correction can be applied manually as a post-processing step.
+In engineering mode a single correction is applied by Vecto. The fuel consumption interpolated from the FC map is multiplied by the engineering correction factor. 
+
+$FC_{whtc} = FC \cdot CF_{Engineering}$
 </div>
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/GearShift.md b/Documentation/User Manual/3-simulation-models/GearShift.md
index 1365182ef7e0263e524ce8c0b810b5b8b5610647..e171186b8f32f72fde7cc763e2727f5d5468e9c8 100644
--- a/Documentation/User Manual/3-simulation-models/GearShift.md	
+++ b/Documentation/User Manual/3-simulation-models/GearShift.md	
@@ -1,5 +1,4 @@
-##Gear Shift Model
-
+##Gear Shift Model (MT, AMT)
 
 
 The Gear Shift Model is based on shift curves that define the engine speed for up- and down- shifting as a function of engine torque. As soon as the engine operation point passes one of the shift curves a gear change is initiated.
@@ -34,21 +33,21 @@ In the Gearbox File two additional parameters are defined:
 ###Gear Skipping
 
 
-Gear Skipping can be enabled in the [Gearbox File](#gearbox-file). By default it is enabled for AMT and MT. Whenever a gear change is initiated (by crossing the up- or down-shift line) VECTO may skip one or several gears as long as the required torque reserve is provided.
+Gear Skipping  is active for AMT and MT. Whenever a gear change is initiated (by crossing the up- or down-shift line) VECTO may skip one or several gears as long as the required torque reserve is provided.
 
 ![](pics/GBX-Editor-shift3.svg)
 
 
 ###Early Upshift
-Early Upshift can be enabled in the [Gearbox File](#gearbox-file) (Allow shift-up inside polygons). By default it is enabled for AMT only. If the next higher gear provides the required torque reserve and it's rpm is still above down-shift-rpm VECTO will shift up.
+Early Upshift (allow upshifts inside the shift polygons) is enabled for AMT only. If the next higher gear provides the required torque reserve and it's rpm is still above down-shift-rpm VECTO will shift up.
 
 
 ![](pics/GBX-Editor-shift2.svg)
 
 
-###Generic shift conditions (extra conditions)
+###Generic shift conditions
 
-- Only allow upshifts if the vehicle is not decelerating **and** the calculated (estimated) acceleration in the next gear is higher than a certain value (default: 0.1 m/s²)
+- Only allow upshifts if the vehicle is not decelerating **and** the estimated acceleration in the next gear is higher than a certain threshold (default: 0.1 m/s²)
 - Do not allow downshifts with less time than a certain amount after an upshift (default 10 s)
 - Do not allow upshifts with less time than a certain amount after an downshift (default 10 s)
 
diff --git a/Documentation/User Manual/3-simulation-models/TC.md b/Documentation/User Manual/3-simulation-models/TC.md
index a9dbad0a86ca2cd9a9a84939ced0d6dae49a856b..1424e38f218adf827f4dcac2d0327eeac72cbdb9 100644
--- a/Documentation/User Manual/3-simulation-models/TC.md	
+++ b/Documentation/User Manual/3-simulation-models/TC.md	
@@ -1,9 +1,8 @@
 ##Torque Converter Model
 
-**!!! The Torque Converter Model is still in development and at the moment only available in Vecto 2.2 !!!**
+The torque converter is defined as (virtual) separate gear. Independent of the chosen AT gearbox type (serial or power split), Vecto uses a powertrain architecture with a serial torque converter. The mechanical gear ratios and gears with torque converter are created by Vecto depending on the gearbox type and gear configuration.
 
-<div class="vecto2">
-The torque converter is defined as (virtual) separate gear. While TC active: Iterative calculation of engine torque and speed based on TC characteristic. Creeping: Engine speed set to idling. Brakes engaged to absorb surplus torque.
+While the torque converter is active engine torque and speed are computed based on TC characteristic. 
 
  ![](pics/GBX-TC.svg)
 
@@ -22,36 +21,17 @@ The Input Torque at  reference engine speed is needed to calculate the actual e
 
 $T_{in} = T_{ref}(v) \cdot ( \frac{n_{in}}{n_{ref}} )^{2}$
 
+$μ(ν) = \frac{T_{out}}{T_{in}}$
+
 with:
 
 -   T~in~ = engine torque \[Nm\]
--   T~ref(ν)~ = reference torque at reference rpm (form .vtcc file) \[Nm\]
+-   T~ref(ν)~ = reference torque at reference rpm (from .vtcc file) \[Nm\]
 -   n~in~ = engine speed \[1/min\]
 -   n~ref~ = reference rpm \[1/min\] (see below)
 
-The torque converter characteristics must also be defined for speed ratios of more than one (ν&gt;1) in order to calculate overrun conditions (torque&lt;0).
-
-
-
-###Setup for Conventional AT gearboxes 
-Torque converter file is defined for **torque converter only**
-
-![](pics/GBX-TC-Setup-1-1.svg)
-
--   Define TC gear with ratio of first (mechanical) gear
--   Set transmission losses of first gear (map or constant efficiency)
-
-![](pics/GBX-TC-Setup-1-2.svg)
-
-
-###Setup for Power-distributed AT gearboxes
-Torque converter file is defined for the **whole gearbox**
-
-![](pics/GBX-TC-Setup-2-1.svg)
+The torque converter characteristics must also be defined for speed ratios of greater than one (ν&gt;1) in order to calculate overrun conditions or engine drag (torque&lt;0).
 
--   Define TC gear with ratio = 1
--   Set transmission efficiency to 1 (= 100%) because losses are covered  by the .vtcc file.
+The torque converter has a separate [Shift Polygon](#shift-polygon-file-.vgbs) which defines the conditions for switching from torque converter gear to locked gear.
 
-![](pics/GBX-TC-Setup-2-2.svg)
 
-</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/powertrain.md b/Documentation/User Manual/3-simulation-models/powertrain.md
index 882e05b11a1b087546767b1df628a14c67576ae3..d98961da9b79878407347ec30f1437d016bd35b3 100644
--- a/Documentation/User Manual/3-simulation-models/powertrain.md	
+++ b/Documentation/User Manual/3-simulation-models/powertrain.md	
@@ -4,4 +4,4 @@ The powertrain in Vecto V3 consists of the following components which are connec
 ![](pics/powertrain.svg)
 
 The engine tries to supply the requested power demand (including all power losses happening in the powertrain and auxiliaries).
-If the engine can't supply the given power demand, the driver component limits it (e.g. by accelerating slower than requested by the driving cycle).
+If the engine can't supply the given power demand, the driver reduces the  accelerating.
diff --git a/Documentation/User Manual/4-command-line-arguments/cmd.md b/Documentation/User Manual/4-command-line-arguments/cmd.md
index 34c90dc5e4c640c4111ed54657f24aec0e8c0bf4..435c92aee9eec9ee7b5163ce42a885bb55d53c90 100644
--- a/Documentation/User Manual/4-command-line-arguments/cmd.md	
+++ b/Documentation/User Manual/4-command-line-arguments/cmd.md	
@@ -1,57 +1,19 @@
 ##Command Line Arguments
 
-Both, Vecto 2.2 and Vecto 3.x can be started from the commandline. The usage is quite different and described below.
-
-<div class="vecto2">
+![](pics/cmd3.png)
 
-![](pics/cmd.png)
+It is possible to start the VECTO simulation via command line without graphical user interface.
 
-It is possible to control basic functions of VECTO via command line arguments (e.g. to automate calculations and results analysis using scripts).
+The Vecto 3.x commandline tool can be used to start simulations from the command line and  runs without  graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel.
 
 ###General Notes
 
 -   The order in which the arguments are provided is arbitrary.
 -   If a file path includes space characters (e.g. "C:\\VECTO Test Files\\Demo.vecto") then double quotes have to be used (as in the picture above).
--   If not the complete file path is defined (e.g. "file1.vecto" instead of "c:\\data\\file1.vecto") then VECTO expects the file in the application directory (where VECTO.exe is located).
-
-
-
-###Engineering/Declaration Mode
-
-        VECTO.exe -run [-close] [file1.vecto file2.vecto ... fileN.vecto]
-
-
-Runs calculation(s) either with the provided .vecto file(s) or (if no file names are defined) with the files already loaded on start up\*. If -**close** is used then VECTO closes after calculations are done.
-
-
-###Batch Mode
-
-		VECTO.exe -run -batch [-close] [file1.vecto file2.vecto ... fileN.vecto] [cycle1.vdri cycle2.vdri ... cycleN.vdri]
-
-
+-   If not the complete file path is defined (e.g. "file1.vecto" instead of "c:\\data\\file1.vecto") then VECTO expects the file in the application directory (where vectocmd.exe is located).
 
- Switches to BATCH mode and runs with the provided .vecto and .vdri files. If no files are defined the pre-loaded files\* are used. If -**close** is used then VECTO closes after calculations are done.
 
-
-###Opening files
-
-		VECTO.exe file1.xxx
-
-
-If the file has one of the following extensions it is opened with the associated editor dialog: .vecto, .vgbx, .veng, .vveh. Note: if more than one .vecto file is provided they will be loaded in the file list (replacing the pre-loaded list\*) instead.
-
-
- *pre-loaded files: When VECTO starts it loads the file lists (.vecto, .vdri) of the last session, see [Application Files](#application-files). These files can be changes manually if VECTO is not running.
-
-</div>
-
-<div class="vecto3">
-
-![](pics/cmd3.png)
-
-The Vecto 3.x commandline tool runs completely without a graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel. Vectocmd supports both types of input files, JSON (in engineering and declaration mode) and XML (Declaration mode only).
-
-The basic usage is as follows
+###Basic usage 
 
         vectocmd.exe [-h] [-v] FILE1.(vecto|xml) [FILE2.(vecto|xml) ...]
 
@@ -70,5 +32,3 @@ The basic usage is as follows
 - -V: show version information
 - -h: Displays this help.
 
-
-</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/5-input-and-output-files/APAC.md b/Documentation/User Manual/5-input-and-output-files/APAC.md
index 99cda21d4ed9bec74175e427f25f32d95e13685b..0486babe70f2e360f6885cca7af7b94895168b0f 100644
--- a/Documentation/User Manual/5-input-and-output-files/APAC.md	
+++ b/Documentation/User Manual/5-input-and-output-files/APAC.md	
@@ -10,6 +10,8 @@ Note that the cycle file name used should ideally respect this syntax to be corr
  
 Some flexibility in syntax is allowable (the model looks for ‘Bus’, ‘Coach’, ‘Urban’, etc. in the file name), meaning that the standard default cycles are fully/correctly supported. However, for newly created cycles (i.e. for use in Engineering Mode) it is recommended to follow the above convention to guarantee correct functionality.
 
+This file contains also the estimated time required for a cycle which is required to estimate the air demand for certain actuations.
+
 ###File Format
 
 The file uses the VECTO CSV format, with an example provided below, with the default values based on the methodology agreed with the European Commission and the project Steering Group.
@@ -38,5 +40,11 @@ Kneeling, Suburban, 6
 Kneeling, Interurban, 0
 Kneeling, Coach, 0
 Kneeling, UnknownCycleName, 0,
+CycleTime,Heavy urban,8912
+CycleTime,Urban,8149
+CycleTime,Suburban,3283
+CycleTime,Interurban,12962
+CycleTime,Coach,15086
+CycleTime,UnknownCycleName,3600
 ~~~
 
diff --git a/Documentation/User Manual/5-input-and-output-files/CSV.md b/Documentation/User Manual/5-input-and-output-files/CSV.md
index 8d1b8b05d7112486e4a8731e3dbf638feec9c453..d164551f42cdd2cd03e424ac47fb3447c487c3ff 100644
--- a/Documentation/User Manual/5-input-and-output-files/CSV.md	
+++ b/Documentation/User Manual/5-input-and-output-files/CSV.md	
@@ -1,9 +1,8 @@
 ##CSV
 Many data files in Vecto use CSV (Comma Separated Values) as common file format. They consist of a header which defines the columns and data entries which are separated by a comma (",").
 
-<div class="vecto3">
 In Vecto 3 the order of the columns is arbitrary if the column header matches the header definitions described in this user manual. If the column header does not match, a warning is written to the log file and the columns are parsed in the sequence as described in this manual as a fall-back.
-</div>
+
 
 ###Definition###
 
@@ -15,6 +14,10 @@ In Vecto 3 the order of the columns is arbitrary if the column header matches th
 | **Thousand-Separator:** | Vecto CSV does not allow a thousand-separator.                                                                                                                                                                                                                                                                                                                                                     |
 | **Comments:**           | **#** (Number sign. Declares text coming afterwards in the current line as comment.)                                                                                                                                                                                                                                                                                                               |
 | **Whitespace:**         | Whitespaces between columns will be stripped away. Therefore it is possible to align the columns for better readability, if desired.                                                                                                                                                                                                                                                               |
+**Note:** All column headers are case insensitive.
+
+**Note:** Unit information in the column header (enclosed in "[" and "]") are just as information for the user. Vecto does **not** read the unit string nor convert between units. The values are expected to be in the units as specified in the user manual. 
+
 
 Following files use the csv:
 
diff --git a/Documentation/User Manual/5-input-and-output-files/VACC.md b/Documentation/User Manual/5-input-and-output-files/VACC.md
index 76ea3bf549dd2795bc371d351888621d2e8740d5..bb6388add1ffb5e6047504cd206de2458c84a437 100644
--- a/Documentation/User Manual/5-input-and-output-files/VACC.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VACC.md	
@@ -11,6 +11,8 @@ vehicle speed. The filepath has to be defined in the [Job File](#job-file). The
 - Requires at least 2 data entries
 - Data should cover the whole possible range of vehicle speeds
 
+**Note:** The deceleration should be lower than a certain threshold for low speeds in order to guarantee accurate vehicle stops during simulation. The suggested deceleration should be lower than -0.5m/s^2 for vehicle speeds below 30 km/h.
+
 **Example Data:**
 
 ~~~
diff --git a/Documentation/User Manual/5-input-and-output-files/VDRI.md b/Documentation/User Manual/5-input-and-output-files/VDRI.md
index 54a9f842bde53900b105e2a2127aab21df057986..3d5d7978efec4a377a5a63b4914e3ad6e8683e93 100644
--- a/Documentation/User Manual/5-input-and-output-files/VDRI.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VDRI.md	
@@ -12,15 +12,9 @@ The basic file format is [Vecto-CSV](#csv) and the file type ending is ".vdri".
 	- [Pwheel (SiCo) Mode, time-based](#engineering-mode-pwheel-sico-time-based)
 - **Engine Only Mode**: [Engine Only Mode, time-based](#engine-only-mode-engine-only-driving-cycle)
 
-<div class="vecto2">
-- Distance-based cycles must have at least a resolution of 1[m].
-- Time-based cycles must have exactly a resolution of 1[s].
-</div>
 
-<div class="vecto3">
 - Distance-based cycles can be defined in any distance resolution, including variable distance steps.
 - Time-based cycles can be defined in any time resolution, including variable time steps.
-</div>
 
 ###Declaration Mode Cycles
 In Declaration Mode driving cycles are automatically chosen depending on vehicle category and cannot be changed by the user. These predefined cycles are of type target-speed, distance-based.
@@ -42,7 +36,6 @@ This driving cycle defines the target speed over distance. Vecto tries to achiev
 Header: **\<s>, \<v>, \<stop>***\[, \<Padd>]\[, \<grad>]\[, \<PTO>]\[, \<vair\_res>, \<vair\_beta>]\[, \<Aux\_ID>]*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
-The order is not important when the headers are annotated with \<angle-brackets\> (less-than-sign "<" and greater-than-sign ">").<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
 
 |  Identifier |  Unit  |                                                                                                                                             Description                                                                                                                                              |
@@ -69,12 +62,11 @@ Units are optional and are enclosed in [square-brackets] after the header-column
 
 ###Engineering Mode: Measured-Speed, Time-Based Cycle
 This driving cycle defines the actual measured speed over time. Vecto tries to simulate the vehicle model using this speed as the actual vehicle speed.
-Due to differences in the real and simulated shift strategies a short difference in speed could occur, but Vecto immediately tries to catch up after the gear is engaged again.
+Due to differences in the real and simulated shift strategies a small difference in speed can occur, but Vecto immediately tries to catch up after the gear is engaged again.
 
 Header: **\<t>, \<v>***\[, \<grad>]\[, \<Padd>]\[, \<vair\_res>, \<vair\_beta>\]\[, \<Aux\_ID>]*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
-The order is not important when the headers are annotated with \<angle-brackets\> (less-than-sign "<" and greater-than-sign ">").<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
 
 |  Identifier |  Unit  |                                                                                                                                              Description                                                                                                                                               |
@@ -98,26 +90,20 @@ Units are optional and are enclosed in [square-brackets] after the header-column
 
 
 ###Engineering Mode: Measured-Speed With Gear, Time-Based Cycle
+
 This driving cycle defines the actual measured speed of the vehicle, the gear, and the engine speed over time.
 It overrides the shift strategy of Vecto and also directly sets the engine speed.
 
-<div class="vecto2">
-It is necessary to set the option 'Use gears/rpm\'s from driving cycle in the **Options** tab.
 
-![](pics/MeasuredSpeedSettings.png)
-</div>
-
-Header: **\<t>, \<v>, \<n>, \<gear>***\[, \<grad>]\[, \<Padd>]\[, \<vair\_res>, \<vair\_beta>]\[, \<Aux\_ID>\]*
+Header: **\<t>, \<v>, \<gear>***\[, \<grad>]\[, \<Padd>]\[, \<vair\_res>, \<vair\_beta>]\[, \<Aux\_ID>\]*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
-The order is not important when the headers are annotated with \<angle-brackets\> (less-than-sign "<" and greater-than-sign ">").<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
 
 |  Identifier |  Unit  |                                                                                                                                              Description                                                                                                                                               |
 | ----------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | **t**       | [s]    | The absolute time. Must always be increasing.                                                                                                                                                                                                                                                          |
 | **v**       | [km/h] | The actual velocity of the vehicle. Must be >= 0 km/h.                                                                                                                                                                                                                                                 |
-| **n**       | [rpm]  | The actual engine speed. Must always be >= 0 rpm.                                                                                                                                                                                                                                                      |
 | **gear**    | [-]    | The current gear. Must be >= 0 (0 is neutral).                                                                                                                                                                                                                                                         |
 | *Padd*      | [kW]   | Additional auxiliary power demand. This power demand will be directly added to the engine power in addition to possible other auxiliaries. Must be >= 0 kW.                                                                                                                                            |
 | *grad*      | [%]    | The road gradient.                                                                                                                                                                                                                                                                                     |
@@ -127,12 +113,12 @@ Units are optional and are enclosed in [square-brackets] after the header-column
 
 **Example:**
 
-| \<t> [s] | \<v> [km/h] | \<n> [rpm] | \<gear> [-] | \<grad> [%] | \<Padd> [kW] |
-| -------- | ----------- | ---------- | ----------- | ----------- | ------------ |
-|        0 |           0 |        600 |           0 |        2.95 |          1.5 |
-|        1 |         0.6 |        950 |           3 |        2.97 |          1.3 |
-|        2 |         1.2 |       1200 |           3 |        3.03 |          1.3 |
-|        3 |         2.4 |       1400 |           3 |        2.99 |          1.3 |
+| \<t> [s] | \<v> [km/h] | \<gear> [-] | \<grad> [%] | \<Padd> [kW] |
+| -------- | ----------- | ----------- | ----------- | ------------ |
+|        0 |           0 |           0 |        2.95 |          1.5 |
+|        1 |         0.6 |           3 |        2.97 |          1.3 |
+|        2 |         1.2 |           3 |        3.03 |          1.3 |
+|        3 |         2.4 |           3 |        2.99 |          1.3 |
 
 ###Engineering Mode: Pwheel (SiCo), Time-Based
 This driving cycle defines the power measured at the wheels over time. Vecto tries to simulate the vehicle with this power requirement.
@@ -140,7 +126,6 @@ This driving cycle defines the power measured at the wheels over time. Vecto tri
 Header: **\<t>, \<Pwheel>, \<gear>, \<n>***\[, \<Padd>]*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
-The order is not important when the headers are annotated with \<angle-brackets\> (less-than-sign "<" and greater-than-sign ">").<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
 
 | Identifier |  Unit |                      Quantity                                                    Description                      |
@@ -162,12 +147,12 @@ Units are optional and are enclosed in [square-brackets] after the header-column
 
 
 ###Engine Only Mode: Engine Only Driving Cycle
-This driving cycle directly defines the power or torque at the output shaft of the engine over time. Vecto add the engine's inertia to the given power demand and simulates the engine.
+
+This driving cycle directly defines the engine's power or torque at the output shaft over time. Vecto adds the engine's inertia to the given power demand and simulates the engine.
 
 Header: **\<t>, \<n>, (\<Pe>|\<Me>)***\[, \<Padd>]*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
-The order is not important when the headers are annotated with \<angle-brackets\> (less-than-sign "<" and greater-than-sign ">").<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
 
 | Identifier |  Unit |                                                    Description                                                    |
diff --git a/Documentation/User Manual/5-input-and-output-files/VFLD.md b/Documentation/User Manual/5-input-and-output-files/VFLD.md
index b2cdd79821e79613073e8a23b5aa2e477b5c8fa8..9e0b18f8d80a5b76c0cbe59491ebb17a3b1f43e6 100644
--- a/Documentation/User Manual/5-input-and-output-files/VFLD.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VFLD.md	
@@ -10,6 +10,8 @@ This file contains the full load and drag curves and the PT1 values for the [tra
     + **PT1 [s]**: the PT1 constant for the transient full load calculation.
 - Requires at least 2 data entries
 
+**Note:** The PT1 column is not required in Declaration Mode! Pre-defined values are used.
+
 **Example:**
 
 ~~~
diff --git a/Documentation/User Manual/5-input-and-output-files/VMAP.md b/Documentation/User Manual/5-input-and-output-files/VMAP.md
index 9ae54f1fd0327776a7d6c894077912e9c3d0e905..8b264030eadbbe51b52c711593a6fb23ebb1ea20 100644
--- a/Documentation/User Manual/5-input-and-output-files/VMAP.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VMAP.md	
@@ -7,13 +7,7 @@ The FC map is used to interpolate the base fuel consumption before corrections
 - Requires at least 3 data entries
 - The map must cover the full engine range between full load and motoring curve.
 
-<div class="vecto2">
-Extrapolation of fuel consumption map is not possible.
-</div>
-
-<div class="vecto3">
 Extrapolation of fuel consumption map is possible in Engineering Mode (with warnings!). In Declaration Mode it is not allowed.
-</div>
 
 **Example:**
 
diff --git a/Documentation/User Manual/5-input-and-output-files/VMOD.md b/Documentation/User Manual/5-input-and-output-files/VMOD.md
index 8ea55a5e0be7aff2180f5f08f45e9a79f00cfaf9..229ed7d6bf1519c2240758f0710d5fec3a9f2a0c 100644
--- a/Documentation/User Manual/5-input-and-output-files/VMOD.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VMOD.md	
@@ -2,50 +2,6 @@
 
 Modal results are only created if enabled in the [Options](#main-form) tab. One file is created for each calculation and stored in the same directory as the .vecto file.
 
-<div class="vecto2">
-***Quantities:***
-
-| **Name**        | **Unit** | **Description** |
-| --------------- | ---------------------- | -------------------------- |
-| time            | [s]      | Time step. |
-| dist            | [km]     | Travelled distance. |
-| v_act           | [km/h]   | Actual vehicle speed. |
-| v_targ          | [km/h]   | Target vehicle speed. |
-| acc             | [m/s²]   | Vehicle acceleration. |
-| grad            | [%]      | Road gradient. |
-| n               | [1/min]  | Engine speed. |
-| Tq_eng          | [Nm]     | Engine torque. |
-| Tq_clutch       | [Nm]     | Torque at clutch (before clutch, engine-side) |
-| Tq_full         | [Nm]     | Full load torque |
-| Tq_drag         | [Nm]     | Motoring torque |
-| Pe_eng          | [kW]     | Engine power. |
-| Pe_full         | [kW]     | Engine full load power. |
-| Pe_drag         | [kW]     | Engine drag power. |
-| Pe_clutch       | [kW]     | Engine power at clutch (equals **Pe** minus loss due to rotational inertia **Pa Eng**). |
-| Gear            | [-]      | Gear. "0" = clutch opened / neutral.|
-| Ploss GB        | [kW]     | Gearbox losses. |
-| Ploss Diff      | [kW]     | Losses in differential / axle transmission. |
-| Ploss Retrader  | [kW]     | Retarder losses. |
-| Pa Eng          | [kW]     | Rotational acceleration power: Engine. |
-| Pa GB           | [kW]     | Rotational acceleration power: Gearbox. |
-| Pa Veh          | [kW]     | Vehicle acceleration power. |
-| Proll           | [kW]     | Rolling resistance power demand. |
-| Pair            | [kW]     | Air resistance power demand. |
-| Pgrad           | [kW]     | Power demand due to road gradient. |
-| Paux            | [kW]     | Total auxiliary power demand. |
-| Pwheel          | [kW]     | Total power demand at wheel = sum of rolling, air, acceleration and road gradient resistance. |
-| Pbrake          | [kW]     | Brake power. Drag power is included in **Pe**. |
-| Paux_xxx        | [kW]     | Power demand of Auxiliary with ID xxx. See also [Aux Dialog](#auxiliary-dialog) and [Driving Cycle](#driving-cycles). |
-| FC-Map          | [g/h]    | Fuel consumption interpolated from FC map. |
-| FC-AUXc         | [g/h]    | Fuel consumption after [Auxiliary-Start/Stop Correction](#fuel-consumption-calculation). (Based on FC.) |
-| FC-WHTCc        | [g/h]    | Fuel consumption after [WHTC Correction](#fuel-consumption-calculation). (Based on FC-AUXc.) |
-| TCv             | [-]      | Torque converter speed ratio |
-| TCµ             | [-]      | Torque converter torque ratio |
-| TC_M_Out        | [Nm]     | Torque converter output torque |
-| TC_n_Out        | [1/min]  | Torque converter output speed |
-</div>
-
-<div class="vecto3">
 In Vecto 3.0.2 the structure of the modal data output has been revised and re-structured. Basicaly for every powertrain component the .vmod file contains the power at the input shaft and the individual power losses for every component. For the engine the power, torque and engine speed at the output shaft is given along with the internal power and torque used for computing the fuel consumption. The following table lists the columns in the .vmod file:
 	
 ***Quantities:***
@@ -71,6 +27,8 @@ In Vecto 3.0.2 the structure of the modal data output has been revised and re-st
 | P_eng_out			|	[kW]	|	Power provided at the engine's output shaft |
 | P_clutch_loss		|	[kW]	|	Power loss in the clutch due to slipping when driving off |
 | P_clutch_out		|	[kW]	|	Power at the clutch's out shaft. P_clutch_out = P_eng_out - P_clutch_loss |
+| P_TC_loss [kW]    |   [kW]    |   Power loss in the torque converter |
+| P_TC_out [kW]     |   [kW]    |   Power at the torque converter's out shaft. P_TC_out = P_eng_out - P_TC_loss |
 | P_aux				|	[kW]	|	Total power demand from the auxiliaries |
 | P_gbx_in			|	[kW]	|	Power at the gearbox' input shaft |
 | P_gbx_loss		|	[kW]	|	Power loss at the gearbox, interpolated from the loss-map |
@@ -110,9 +68,14 @@ In Vecto 3.0.2 the structure of the modal data output has been revised and re-st
 | AA_CompressorFlag                    | [Bool [0/1] | Compressor Flag (off/on), Advance Auxiliaries Module |
 | AA_TotalCycleFC_Grams                | [Grams]     | Total Cycle Fuel Consumption in grams, Advance Auxiliaries Module |
 | AA_TotalCycleFC_Litres               | [Litres]    | Total Cycle Fuel Consumption in litres, Advance Auxiliaries Module |
+| TCnu              |   [-]     |   Torque converter operating point:  speed ratio    | 
+| TCmu              |   [-]     |   Torque converter operating point:  torque ratio    |   
+| T_TC_out          |   [Nm]    |   Torque converter operating point:  output torque    | 
+| n_TC_out          |   [rpm]   |   Torque converter operating point:  output speed    |  
+| T_TC_in           |   [Nm]    |   Torque converter operating point:  input torque    |    
+| n_TC_in           |   [rpm]   |   Torque converter operating point:  input speed    |     
 | FC-Map			|	[g/h]	|	Fuel consumption interpolated from FC map. |
 | FC-AUXc			|	[g/h]	|	Fuel consumption after [Auxiliary-Start/Stop Correction](#fuel-consumption-calculation) (based on FC) |
 | FC-WHTCc			|	[g/h]	|	Fuel consumption after [WHTC Correction](#fuel-consumption-calculation) (based on FC-AUXc) |
 | FC-AAUX			|	[g/h]	|	Fuel consumption computed by the AAUX module considering smart auxiliaries |
 | FC-Final			|	[g/h]	|	Final fuel consumption value after all applicable corrections |
-</div>
diff --git a/Documentation/User Manual/5-input-and-output-files/VTCC.md b/Documentation/User Manual/5-input-and-output-files/VTCC.md
index 82254a47c71b1d0ba407f0611b14ff39debe9d3f..b2c685c1d2aceb69b77f04ed0f0dac118e44c298 100644
--- a/Documentation/User Manual/5-input-and-output-files/VTCC.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VTCC.md	
@@ -1,14 +1,29 @@
 ##Torque Converter Characteristics (.vtcc)
 
-**!!! The Torque Converter Model is still in development !!!**
-
-<div class="vecto2">
 The file uses the [VECTO CSV format](#csv).
 
-- Filetype: .vtlm
+- Filetype: .vtcc
 - Header: **Speed Ratio, Torque Ratio, Input Torque at reference rpm**
 - Requires at least 2 data entries
 
 
 See [Torque Converter Model](#torque-converter-model) for more information about the component model.
-</div>
\ No newline at end of file
+
+
+**Example:**
+
+~~~
+Speed Ratio, Torque Ratio, MP1000
+        0.0,         1.93, 377.80
+        0.1,         1.82, 365.21
+        0.2,         1.70, 352.62
+        0.3,         1.60, 340.02
+        0.4,         1.49, 327.43
+        0.5,         1.39, 314.84
+        0.6,         1.28, 302.24
+        0.7,         1.18, 264.46
+        0.8,         1.07, 226.68
+        0.9,         0.97, 188.90
+        1.0,         0.97, 0.00
+...
+~~~
diff --git a/Documentation/User Manual/5-input-and-output-files/VTLM.md b/Documentation/User Manual/5-input-and-output-files/VTLM.md
index c503fb63568c55825f8de03dba9ea7720378a27d..0f5e6a1f38ae4f80f95e287c25394d3d4f91dcf4 100644
--- a/Documentation/User Manual/5-input-and-output-files/VTLM.md	
+++ b/Documentation/User Manual/5-input-and-output-files/VTLM.md	
@@ -1,5 +1,5 @@
 ##Transmission Loss Map
-This file defines losses in gearbox and axle transmission and must be provided for each gear in the [Gearbox File](#gearbox-editor). The file uses the [VECTO CSV format](#csv). The same file format is also used for the axle gear (gear 0) and the angular gear.
+This file defines losses in transmission components, i.e. every gear, axlegear, angledrive. The file uses the [VECTO CSV format](#csv). The same file format is also used for the axle gear (gear 0) and the angular gear.
 
 - Filetype: .vtlm
 - Header: **Input Speed [rpm], Input Torque [Nm], Torque Loss [Nm]**