Swapped to using polynomial fitter and tweaked wavelength fitting