diff --git a/Makefile b/Makefile
index 8bf6899ff..8338a6959 100644
--- a/Makefile
+++ b/Makefile
@@ -251,11 +251,11 @@ print-%: ; @echo $* = $($*)
 
 cliparser:
 	# Get list of all commands
-	cat doc/commands.md | grep -e ^\|\` | grep -v help | cut -f 2 -d "\`" |  awk '{$$1=$$1};1' > cliparser_all_commands.tmp
+	cat doc/commands.md | grep -e ^\|\` | cut -f 2 -d "\`" | grep -v help | awk '{$$1=$$1};1' > cliparser_all_commands.tmp
 	# Get list of cliparserized commands
 	grep -r CLIParserInit ./client/src/ | cut -f 2 -d "\"" | awk '{$$1=$$1};1' > cliparser_done.tmp
 	# Determine commands that still need cliparser conversion
-	grep -xvf cliparser_done.tmp cliparser_all_commands.tmp > ./doc/cliparser_todo.md
+	grep -xvf cliparser_done.tmp cliparser_all_commands.tmp > ./doc/cliparser_todo.txt
 
 style:
 	# Make sure astyle is installed
diff --git a/client/dictionaries/t55xx_default_pwds.dic b/client/dictionaries/t55xx_default_pwds.dic
index 6e7a69583..afc00bddf 100644
--- a/client/dictionaries/t55xx_default_pwds.dic
+++ b/client/dictionaries/t55xx_default_pwds.dic
@@ -20,6 +20,11 @@ A5B4C3D2
 00434343
 44B44CAE
 88661858
+#
+# ZX-copy3  T55xx / EM4305
+# ref. http://www.proxmark.org/forum/viewtopic.php?pid=40662#p40662
+19920427
+84AC15E2
 # paxton bullit?
 575F4F4B
 #
diff --git a/doc/cliparser_todo.md b/doc/cliparser_todo.txt
similarity index 99%
rename from doc/cliparser_todo.md
rename to doc/cliparser_todo.txt
index 1113d6616..e1facf7da 100644
--- a/doc/cliparser_todo.md
+++ b/doc/cliparser_todo.txt
@@ -13,7 +13,6 @@ analyse a
 analyse nuid
 analyse demodbuff
 analyse freq
-analyse foo
 data biphaserawdecode
 data detectclock
 data fsktonrz
@@ -29,6 +28,7 @@ data grid
 data ltrim
 data mtrim
 data norm
+data plot
 data rtrim
 data setgraphmarkers
 data shiftgraphzero
@@ -119,6 +119,7 @@ hf mf restore
 hf mf setmod
 hf mf wrbl
 hf mf sim
+hf mf ecfill
 hf mf eclr
 hf mf egetblk
 hf mf egetsc
@@ -261,9 +262,7 @@ lf jablotron read
 lf jablotron clone
 lf jablotron sim
 lf keri demod
-lf keri read
 lf motorola demod
-lf motorola read
 lf motorola sim
 lf nedap demod
 lf nedap generate
diff --git a/doc/commands.md b/doc/commands.md
index bc0855668..57038cbba 100644
--- a/doc/commands.md
+++ b/doc/commands.md
@@ -38,7 +38,6 @@ Check column "offline" for their availability.
 |`analyse nuid           `|Y       |`create NUID from 7byte UID`
 |`analyse demodbuff      `|Y       |`Load binary string to demodbuffer`
 |`analyse freq           `|Y       |`Calc wave lengths`
-|`analyse foo            `|Y       |`muxer`
 
 
 ### data
@@ -733,7 +732,7 @@ Check column "offline" for their availability.
 |-------                  |------- |-----------
 |`lf keri help           `|Y       |`This help`
 |`lf keri demod          `|Y       |`Demodulate an KERI tag from the GraphBuffer`
-|`lf keri read           `|N       |`Attempt to read and extract tag data from the antenna`
+|`lf keri reader         `|N       |`Attempt to read and extract tag data from the antenna`
 |`lf keri clone          `|N       |`clone KERI tag to T55x7 or Q5/T5555`
 |`lf keri sim            `|N       |`simulate KERI tag`
 
@@ -746,7 +745,7 @@ Check column "offline" for their availability.
 |-------                  |------- |-----------
 |`lf motorola help       `|Y       |`This help`
 |`lf motorola demod      `|Y       |`Demodulate an MOTOROLA tag from the GraphBuffer`
-|`lf motorola read       `|N       |`Attempt to read and extract tag data from the antenna`
+|`lf motorola reader     `|N       |`Attempt to read and extract tag data from the antenna`
 |`lf motorola clone      `|N       |`clone MOTOROLA tag to T55x7`
 |`lf motorola sim        `|N       |`simulate MOTOROLA tag`