Fixed settings
Clean up
Readd settings