Upgrade quick

Sone updates to the upgrade process to (almost) cover upgrades from SMF.