New feature: Full Diagramming guideline support. General bug fixes.

New feature: Full Diagramming guideline support. General bug fixes.