final changes before trying to port to jgraphT