More tweaks, add config files