Updated data, fixed links