Some more changes for install script, not yet done