a bit more re-org, moved the indegree stuff into the basic graph syntax