Commenting & uncommenting + fix pointfree