Commenting changes + minor bug fix