cleanup & add settings