Some updates, graph plot now works