Better documentation and CLI code