Fixed Bugs In Graph

Ready for Main