Too many changes to record.
Mostly fixes & cleanup; some smaller enhancements