Fix and comment few thing around