fix pgp key import, cleanup.