Fix to install script and some tweaks