Made some more of the changes