Commenting improvements