Please merge this ...

I changed a lot of stuff...