[highlight] add some more highlighting and fix some other nits