Tweaks for open pull request

Little things I'd like to see in #4.