Revert "Revert "Comment improvements.""

This reverts commit 6d22a2189441ee44f3f989acffe23fed30248a4e.