Edit prompts and misc fixes