Less broken score

I think this solves the score system, but at worst it is less broken.