Made some fixes, plus added initial guesses to the general fitter.