Adjusted the final touches to make sure that the calculations are right.