Calculation Errors Fixed