add comments and separate configs by subject