improve syntax highlighting slightly
infix operators, various improvements tmpl exp
some reordering