syntax and unicode fixes