Commenting fixes and additions