Enhance highlighting
Fix typo
Fix typo