Updated Installation (mostly)