Bug fixes & additional logging.