some adjustments, runs now in the right direction
Authored by: gunfloe 2015-05-23
Parent: [r33236]
Child: [r33238]