added some TODOs for errors in data retrieval