Fixed up graphing