A couple of changes

Remember when I said I was bad at git? Still stands. I promise
everything works, though!