fix plotting; TODO: tests, reports