Fixing some calculation issues.