improved logging/reporting