Fixed some relevant commentaries