small updates to better handle data loading