display highs and lows in diagram
fixed lots of filter bugs
merge conflict