fixed null check for highlight. fixed syntax on events