changed character encoding and added some more stuff