loads of changes

So many changes that I just lost track... :)