Bug-fixes and install script update