clean up filter and times, redo get_par, change DataFilter