Fixed some more

Had an issue with UTF-8 and some stuff got broken.