Tidied up the install file and made some improvements