Fixed some issues with tracking and displaying elapsed time.