fixed stuff, this is a bad example of a commit message DO NOT REPLICATE

#DO NOT MERGE IN THIS PULL REQUEST

Look at the diffs to see what was changed. We can go over this in the morning/afternoon/later this week if it doesn't make sense, or even if it does make sense and you just have other questions.

Also, notice the whitespace changes. I know it's early in the phase, but don't get in the habit of writing messy code files. Whitespace should always be deliberate.