merge documentation corrections