further comment fixes