Corrected install instructions
Various minor fixes to setup script