Improve fitting.  Refs #7001.
Improve FindPeaks.  Refs #7001.