Config groups, minor formatting