fix some other bugs, score 8.5