Added some more to the plotting algorithm.