smarter score update, timer update, refactoring