some fix and comment