Commenting and quick bug fix