Fix CLI and document a little better.