Add some CLI examples, more readability changes