Added a description to settings that shows up in the config file.
More refactoring of setting names.