unicode character fixes in progress