Many diacritic fixes coming