More changes and enhancements.