Counting refactoring. Lap time counts up now too.
Minor comments.