Fixed reversed changes

Some of the changes that I worked on over the past few days were reversed, so I just went back and changed them again.