Tweak and rework some things