TRIVIAL more tests and fixes, command-line still broken
TRIVIAL more cli
more tests and fixes
cli