Serious clean up in the settings files
Updating README with some TODO's and moving some lines around