a bunch of stuff
some more changes