Settings

-Settings improvements
-Cleaned up code