Add uninstall target and minor fix in script