Minor improvements

Let me know if you want something different; I can rebase and update the pull request.