improved logging/traces - 3