Fixed the encrypter
Tweak how key is checked.
fix fonflicts.