fixes to data pulls