Ok, _really_ fixed math now. I think.