Various improvements

minor improvements to install and uninstall