cleanup and test settigns modifications