More graphing improvements