changes

just a shitload of changes
some stuff

I have no idea, I think it's James' changes...