Minor changes for #152

Just changing some of the verbose comments and output types really. nothing major.

Not sure if I've made this pull request correct, it looks like there's too many commits. Advice welcome. Still trying to get hub to work through my  proxy so I can push to the existing pull-request. Sorry.