Cleaner output - rounding error fixes