point highlighting fixes and performance fixes