Final changes

Stuff changed :P