fixed some stuff, added some stuff, moved some stuff. I'm so good at comments.