removed redundancies, added uninstall option