Bug fixes in scoring.