Document --help, and fix NPE