Named list of members
and other minor changes