fixed bug with adding/removing owners/members, some cleanup