tweaks to @mglinski's groups changes