Update the Scoreboard system

Raino, pls browse