Trying to fix somebugs in the scoring code.