Fixed some errors in install
Tidy up