Added scoreboard, small fixes