Added jcryption + some fix