A couple of small changes

I had the time and thought I could try my hand at actually implementing the requests I made in #10 and #11. Easier than I thought, so here we are.