Made a bunch of small changes. I'm really bad at commenting!