tweaks to data loading