Merge pull request #32 from jacobwagner/master

fixed more upgrade stuff
fixed compute upgrades