Now just adding enhancements to graphs and cleaning up code a ittle