Proper graph data
Remove debugs
Some changes