Note: A few other changes are included in this pull request. I accidentally committed some changes that I didn't mean to several days ago, then had to fix them today, so there is some extra stuff in the pull request that doesn't actually do anything.
Note: A few other changes are included in this pull request. I accidentally committed some changes that I didn't mean to several days ago, then had to fix them today, so there is some extra stuff in the pull request that doesn't actually do anything.