bugfix + uninstall + refactor
goodnight, will fix thistomorrow