Update and fix graphing