Correct calculation of improved algorithm and configure tracks correctly.
Authored by: hagru 2014-04-09
Parent: [r174]
Child: [r176]