Another update and fixes for install script