code fixes for groups...