More changes

Haha, this will be my last pull request for a few months! lol