Fixed some commentaries