Scoring. fixes #9 and #10