Fixed scoreboard tie-in completely.