Scoreboard generation changes for a nicer scoreboard.