Changed LOTS of stuff

not really doing the github thing right… :D