Speed up 2D fitting

Made some changes to the 2D fit trace reporting to attempt to speed up
the fits. It seems to have worked moderately well.

DSB