Some updates...mostly work on the graph implementation