subgroup changes, bug fixes