Various minor updates accumulated working with usergroups modules