added interpolation/aggregation for graphs, fixed plotting