Commenting and bux fixing