some encoding problems fixed