Added more scoreboard support, fixed a bug where the scoreboard wouldn't go away.