added uninstall and some other minor stuff