Add utf8
Fix comments