some cleanup, and an attempt to save GroupActivity (not sure how to spawn me a group to test tho :D )