highlighting fixes; sketchy work