Added uninstall, do some further testing!