Lotsa changes

* Sorry - too lazy to write about all of them :)