Added support for kana and some other stuff