Updates and fix on highlighting