More instrumentation
Merge pull request #172 from ToonTalk/master

More instrumentation