added logic for multi-day journeys
updated validations