Further work on the upgrade scripts / description