Thomson fixed. Matches cython and Numpy solver now