Fixes

Various little improvements. I tried to keep the commits small and coherent, so you can easily cherry-pick.
I was following this one:
https://code.google.com/p/go-wiki/wiki/CodeReviewComments#Comment_Sentences
but I'm fine with your version.