Fix and tweak scoring