Three commits in the same pull request, as I don't know how to separate them in github

[jameyhicks]

If you want separate pull requests, you have to push different branches. These all look good to me, so merging.