More work on installation and uninstallation