Fix and comments