More rounding errors, should be all fixed now