Fix encoding problems, improve editorially