reorganised fit_functions_and_solvers