Minor fixes

Not sure why it insists on adding all of these commits to the pull request, I actually just merged your changes and then just wanted to let you know about the last two commits (see below).

Maybe you can try the merge manually? Most of the changes should be redundant since you already applied them earlier (but manually without reference to my commits, so I guess formally git is right...)

If that would work we would all be on the same page again, which would be nice. :-)