update to match new getopt-based options