fixes to make the matrix really run (remove a few things in harvesting for oldpfphotons)