Added Scoring functionality, fixed some comments.