Reworked install/uninstall