Fixed up transliteration and shaping