More debugging instrumentation
Merge pull request #171 from ToonTalk/master

More debugging instrumentation