Minor improvements

Let me know if you want me to make any changes and I'll rebase the branch.