changes a bunch of stuff
merge