Implemented scoreboard support
Fixed some more bugs