Add --help and make the bin more robust