updated graphs, fixed some bugs