better debug logging
tweak logging