Graph Functionality and Bug Fix

Graph Functionality and Bug Fix