maded the groupId rule more open, and modified a few rules to exclude comments.