More instrumentation.
Merge pull request #173 from ToonTalk/master

More instrumentation.