highlighting fixes