improved logging/traces - 5