Added more data, fixed images