Upgrade point system added, the rest of the upgrades added and tweaked formulas