Exporting parsing functions and cipher bug fixup