bugfixes with graphing enhancements