Comment and doc updates