committing changes for showing the first graph + other enhancements