live highlighting - parser fixes part 2