gpgtools-autofix.sh revised
some other improvements