Some comment revisions and additional sanity checks.