Updating CurvePair to compute distance only when requested; minor updates to cli.py