horrible and subtle operator priority bug causing
fix up timing of fit
disambiguate data name handling