Better selection word options, added tone selection