Clean some things up. Fix up Settings, etc.