Math fixes

Basically, the previous release was my own math. This time I had someone else figure out how to do the math for me. Needless to say, it got more efficient and shorter.