Fixed scoreboard bugs.
Fix other minor bugs