tweaks and fix for config