fixed random stuff
more stuff