Many updates in installation script