[#21] Adds more logging to diagnose problems