Add package upgrade line
Change install procedure a little, fixing bugs