fixed bug where the settings weren't saved correctly & bug where we
couldn't exit from the cli-version.