Tweak scoring to follow quintopia's suggestion