several Fixes and CFG format enhancements.