Lots of updates and tweaks and changes and additions and fixes

The commit comments have most of the details.