A few small updates

I had this work done and figured it was worth committing it before I move on to setting up a build branch.

Closes #4.