Refactoring of graph to clustering (NYD), various bug fixes minor enhancements, entry file differences (and any set op on such)