setup stuff
some more changes