Fixed HarvestLight and attempting to fix some conflicts. qq