Added Scoreboard + minor changes