Lots of changes to lots of things