Lots of adjustments and corrections