Improved track time calculation.

Still not exact.