Scoring should now all be working