Fixing logging messages. Added additional logging.