improve highlighting and file references