Fixes
Merge new install script