fix and comment