Fyrther improvements to auto-install script.