Improved config grouping, and tweaked logging.