Improved Metrics (#533)

Steps should be recorded as of their completion time, not their start
time, as they aren't recorded until completed.