add more logging for better debug diagnostics