some changes. fixed eid2 decryption for good