I grouped the config items in a new way and added a few comments.