improved logging/traces - 2