fix a bunch of the changes