Bug fixes, counting time spent on step.