fix more character encoding stuff