Improve scorer.
Fix scorer.