more detailed debug logs + 1 fix