Made a few quick changes here-and-there. Lemme know if I missed anything, since I'm a little distracted at the moment.