fixed diagram generation by removing circular imports.  closes #103