Comments & fixes.