Fixed lots of stuff, 'specially groups.