remerged GMF diagram code to put mapped sub-elements and attributes in separate compartments. This prevents reordering bugs with drop and drag and drop.
removed several older print statements that clutter the logs