More instrumentation
Merge pull request #168 from ToonTalk/master

More instrumentation