A few tiny fixes plus some version bumps

Let me know if you don't like the changes, or if you'd rather I work in a non-master branch for now.