made a bunch of changes on a lot of things