Fixed bugs with scoreboard