A few random fixes

Hi!

Really liking the direction that this is taking, though it looks like it's still a work in-progress. Here's a few things that I noticed that need fixing.

Thanks!