Fix some of the scoring system functionality