Error fixes
Lot of work on the data retrieving and processing