Group fixes

Fixes #128 
Fixes #127 
Fixes #125