fixed some issues, now groups left