Some cleaning up and enhancements of groups events, and users