improve handling of --help