Merge pull request #48 from robparrott/master

Myriad improvements to help test and debug stuff.