cfg and related tweaks