minor updates to data handling