Empty graph added plus small bug fixed