More changes.
Numerous updates and fixes.