Mostly updates to graph drawing/subpath finding