Review & fixes