more work on openpgp issues. clean up key generation.