Added fitting_solver, fitting_allowswitch options