diacritics change + many small adjustments