Clean up docs and code comments

Also in this commit I prompt for the passphrase twice
for encrypting with a new passphrase.