doc updates
Cleanup of comments