Commenting issues fixed