Make everything better, I guess

Thanks, @ttaylorr
Make a few things better

Don't you love my commit messages?!?!?