Cleaned up configuration and added comments on other configuration options.