Major improvements to the installation/uninstallation