Some refactoring to method names
Makefile improvements
More Makefile tweaks
Add Node suffix to node functions
Add graph labels
Fix up test names
Rework watch mechanism
Initial pass at compound digraphs
Add compound graph