Fixed TODOs

Including the addition of a "score" attribute.