Updated some comments and logging.

1. To help with debugging, updated some debug logging.  Also coherentized
a comment.