Added a list of things to fix and fixed Upgrade limitations