added more graphs and refactor grapher