Installer/Uninstaller improved