Clean up and Some key-settings changed.