yaml config files related and more adjustments..