Highlighting improvements and bug report