Fix scoreboard bug
Fix timing bug