Small fixes and ScorerTests added.