refactor - mostly just sorting things
remove apt-get upgrade step
bugfix: re-add missing &&