Further instrumentation

And removal of localstorage stuff
Merge pull request #166 from ToonTalk/master

Further instrumentation