Lots of changes...
And some additions.