consolidated config keys. Improved config documentation and slightly grew the area in config