Commenting and minor changes