comment and doc changes requested