Version upgrades and cleanups

This is still a work-in-progress.
Still need to convert this to validation.yml