fix dates (departure and return) problems and logic