Version upgrades and cleanups

This is still a work-in-progress.