fixes scoreboard issue and a few other bugs