CHanged initial eps regularisation from epsreg*2E2 to epsreg*2E1. Deleted hack in solver. Improved tests.