Add members and invitations

+ other tidy up