Some minor tweaks. Making PGP integration explicit.