Update to fix rounding errors and replace an invalid float with an int