cahnged a bunch of stuff
more changes by woj