Various comment fixes

Spenser Shumaker <sshumake@redhat.com>