Fixed some string encodings, changed output