Installer/Uninstaller: Added more checks and cleaned comments