Comment and Document Tweaks