fixing date format, TODO list