Regarding #3: When enhancements exist, I always perform upgrades from a copy of the live system, not the original. Uninstall the enhancements from the copy, not the live system. Many times, enhancements may not function as they previously did, and without access to the original installation, troubleshooting becomes extremely difficult.