* Fixed Encryption
* Few other fixes