[cvs-nhc98] Some formatting, some tidying of interactive prompts, and