Added comments for groups, changed yaml file