tweak start date/end date handling, add sampling