removed more dependencies on parser.
Adjustments and utilities for testing and development.