Fixed most encoding issue, some persist.