fixed a bunch of bugs in scoring calculators
merged