changed program name; added --help
sync upstream changes