many fixings

lots of adjustments.