More changes - enhancements
Renaming datasets and updating some