removed superflous argument
converted some more CLI tools, minor CLI class updates