Move score tracking to the timer object.

Score tracking now works correctly.