More changes because I'm terrible at frequently committing.

More changes because I'm terrible at frequently committing.