added uninstall and reset buttons, misc fixes, refactoring