improv the date handling due to many different format + fix some issues