Validate wording
Various fixes