Makefile maintenance
Cleanup infrastructure
Fixed the issues with the graph

FIX #1 Draw the graph
FIX #4 The graph isn't created correctly