various textual improvements, plus fix for OptionalDropDownChoice