some updates to data loading