fixed more upgrade stuff