fixed more charsets. Everything should work mostly properly