fixed null check for highlight. fixed syntax on events
Merge pull request #36 from avalanche-canada/dev

fixed null check for highlight. fixed syntax on events