Commenting and a few fixes