syntax highlighting and misc fix