Scoring logic + misc improvements