More cryptography sections redone