more highlights, added delimitMate