Clarification of discovery and availability, wording suggestions