simplify graph type
short test
remove redundant test in Pop
merge.  still broken