Group modeling tweaks

Group modeling tweaks and typo fixes.