more changes to encryption stuff. Simplified encryption process. Added enc_key and enc_key_drive parameters