applied changes from Abdolmahdi Saravi
some unicode and localization fixes