Tidy up command line options, allow min/max predictions.