improve highlighting and a few minor fixes