added extra graphing, optimize test with flotter