changes to grpah mapper to relfect renaming and a bug in add_subedge