Commenting and fixes