More changes, fixed install script