Rollup of changes

Here's a large laundry list of changes.