Encrypt data support and minor bug fixes.