Switched logging back on.
Improved logging.