Correct comments, delete useless things and add other comments