Add uninstall, other fixes