Minor commenting changes and better logging.