Better character classes and wording