small changes to datafetcher