Improved logging.
Improved logging.