formal changes
+cipher and cipherraw (commnad line parsing) corrected