Curve ssolver fix

Made some corrections and fixes to the CurveSolver which were missed by the test case which wasn't being ran!