Improve debug logging

Change-Id: I8185df33fe2d1378f63a288661806fb401c1a7ff
Experiment with various tweaks to leitner system

Change-Id: I7522a805d2b31aa0ccf1e4c618614398045439e9