Scoreboard and some little bugfixes