comments & fixes