Commenting updated

Updated some comments and removed some minor things