Fixes for upgrades, manufacture andpurchases
error is last commit, pushing again