fixed more scoring stuff; should probably move to objects rather than functions for the analysis
fixed more scoring stuff