better graphs and tested water benchmark.  WIP (#11)