More config and script tweaks