A whole bunch of adjustments and updates