correction on date filter
first pass on plot2
more improvements