highlighting & fixes