Fixed a few more problems with the math