Lots of group improvements

random stuff