Added a bunch more upgrades
?