p2: update usage and --help for -e