Add dianostics/debugging features

[pfalcon]

I have various debugging hacks in my local repo, but too shy to merge them in, for the fear of making code quality worse. So, think and plan how to handle it.