update psf-convolved model fitting to be a bit more consistent with other psphot fitting, and a bit more flexible; fix the diff stats