add 'remove user from group' + minor modifications