Timer and score fixes