More work on curves
Fixing problems introduced with changing the pairs code