Graphs and minor bug fixed