Some fixes to statcalc

Mainly, switching the order of application of boosts. The old way was causing
a small error in the result.