fixes to timer and score