Some adjustements to comments