More graphing bugfixes