Add comments and clean out a bad log message.