Private members round 3

plus other base updates