added more unicode stuff