lots of random changes

a lot of random crap added