further comment fixes and method / member movement