More changes

Lots of stuff — too much to add here.