further UTF-8 fixes and name correction