groups tweaks and fixes