changed stuff... and stuff

more or less finished