graphs for debugging...

and some other changes...