Changed some methods in Graph.scala...hopefully cleaner.