Made a bunch of changes