Fixed some of the Scoreboard implementation.