lots of group improvements