Tweaks to prompt, and merge in old configurations