Rework some things.