syntax highlight improvements