Commenting

This pull request contains changes mainly related to commenting.