improved logging/traces - 1