general as well as edge level handling fixes.
some more fixes
remove the debug counts