Better debugging messages.
Merge pull request #157 from eaburns/dev/debug

Better debugging messages.