Commenting and small fixes