changelog, fixed wrong links, combined engine only mode to one chapter

User Manual/2-calculation-modes/engine-only.md

 ##Engine-Only Mode
 
+When this mode is enabled in the Job File then VECTO only calculates the fuel consumption based on a load cycle (engine speed and torque). In the [Job File](#job-file) only the following parameters are needed:
+
+-   Filepath to the Engine File (.veng)
+-   Driving Cycles including engine torque (or power) and engine speed
+
+The driving cycle also has to be in a special format which is described here: [Engine Only Driving Cycle](#engine-only-mode-engine-only-driving-cycle).
+

User Manual/2-calculation-modes/engineering.md

@@ -25,9 +25,30 @@ In VectoCMD V3.x the default mode is Declaration Mode.
 ###Options###
 The option depends on the driving cycle and cannot be chosen explicitely. For more information see [Driving Cycles](#driving-cycles).
 
-- Target Speed
-- Measured Speed
-- Measured Speed with Gear
-- Pwheel (SiCo)
+###Target Speed
+
+This option is the a target vehicle speed distance based cycle (like in Declaration Mode). With this option experiments can be made by the manufacturer.
+
+###Measured Speed
+
+See [Measured speed, time-based cycle](#engineering-mode-measured-speed-time-based-cycle).
+
+
+
+###Measured Speed with Gear
+
+See [Measured speed with gear, time-based cycle](#engineering-mode-measured-speed-with-gear-time-based-cycle).
+
+
+
+###Pwheel (SiCo)
+
+In Pwheel mode the measured power at the wheels is given, and the simulation takes that as input.
+
+For more information see [P~wheel~-Input (SiCo Mode)](#pwheel-input-sico-mode).
+
+
+
+
 
 

User Manual/3-simulation-models/EngOnlyMode.md

-##Engine Only Mode
-
-When this mode is enabled in the Job File then VECTO only calculates the fuel consumption based on a load cycle (engine speed and torque). In the [Job File](#job-file) only the following parameters are needed:
-
--   Filepath to the Engine File (.veng)
--   Driving Cycles including engine torque (or power) and engine speed
-
-The driving cycle also has to be in a special format which is described here: [Engine Only Driving Cycle](#engine-only-mode-engine-only-driving-cycle).
-

User Manual/3-simulation-models/PwheelInput.md

@@ -13,7 +13,7 @@ Distance Correction must be disabled ([Options tab in Main Form](#options-tab)).
 
 **Example driving cycle with P~wheel~ input.**
 
-| \<t\> | \<Pwheel\> | \<Gear\> | \<n\>
+| \<t> | \<Pwheel> | \<gear> | \<n>
 |-------|------------|----------|--------
 |1      |0.0         |0         |560.0
 |2      |0.0         |0         |560.0

User Manual/3-simulation-models/StartStop.md

 ##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):**
 
-
-Parameters in [Job File](#job-file):
-: -   **Max speed \[km/h\]**.
+-   **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

User Manual/6-changelog/changelog.md

@@ -11,7 +11,9 @@
 - ModData Format changed for better information and clarity
 - Added validation of input values
 - Better Integration of VectoCore into GUI (Notifications and Messages)
-- Fixed some driving behaviour related bugs in VectoCore
+- Fixed some driving behavior related bugs in VectoCore:
+    + When the vehicle comes to a halt during gear shift, instead of aborting the cycle, it tries to drive away again with an appropriate gear.
+- For all calculations the averaged values of the current cycle step are used.
 
 
 **VECTO 3.0.1**

User Manual/files.txt

@@ -17,7 +17,6 @@
 3-simulation-models/AccLimit.md
 3-simulation-models/Auxiliaries.md
 3-simulation-models/cd.md
-3-simulation-models/EngOnlyMode.md
 3-simulation-models/StartStop.md
 3-simulation-models/FC.md
 3-simulation-models/Shift.md