Minor additions for prompts, etc. in trying to get better editables underway