Reformatted graphs and output to be much more useful