Major install script update.
Small cleanup.