Fixed the UTF-8 encoding + minor changes