Lots of changes all around...

... Too much to list here, sorry.