Scoreboard complete. Some bug fix