Fixing issue with utf8 in comments
Minor tweaks