More graphing changes