Fixed UTF issues and some other stuff