Redo a few things.