One (Or Two) Ugly Bugs Down

We found a couple of ugly calculation bugs today and fixed them.

I am greatly looking forward to the upcoming three-day weekend. :)