Even more instrumentation
Merge pull request #167 from ToonTalk/master

Even more instrumentation