More fixes and a bit more on groups