snippets; highlighting improvements