Feature/dates

proper date formating