Prompts

Prompt nitpicks, split off from pull request 738