removed a change Hawken made because it broke the functionality of the scoring mechanism
undid a change in calcScores that broke the functionality
merge stuff