more progress on applying refinements to graph