Fixed adjustment and rounding issues.
More rounding issues