improved logging/traces - 4