Squashed some minor bugs relating to scoring logic.