* Commenting fixes