improving gpg key handling