Changes to accept highlightning, range of dates, date changes, some other changes