[ENH] Made some tweaks to groups