fix & change a bunch of things