Fixed timing issue
Improved time handling
Better logging of step times