a lot of bugfix, scoreboard etc