Changed encoding, several other things