More work done to try to improve the MC fitting routine.