text improvements, wrap config into config blocks