Change by okhin

Merging some points together, added cryptography, changed some formulations.