get rid of all the _members and some minor changes