Fixing math and more math
Merge remote-tracking branch 'origin/master'