committing changes related to making keypair management more robust.