Handle UTF-8 BOM for notepad
Fixed comment handling