Add encrypt, decrypt. Fixed wrapping in conversion functions