Added errors and fixed dats