some more members and other tweaks