Lots of changes. In no particular order: