fixed problems with OrderFactory and model logic dealing with upgrades