Some highlight and text processing changes.