diff --git a/Recon/include/Recon/DBScanClusterBuilder.h b/Recon/include/Recon/DBScanClusterBuilder.h
index 7db9a7862..6ded7cf96 100644
--- a/Recon/include/Recon/DBScanClusterBuilder.h
+++ b/Recon/include/Recon/DBScanClusterBuilder.h
@@ -69,7 +69,7 @@ class DBScanClusterBuilder {
   float dist(const ldmx::CalorimeterHit * a, const ldmx::CalorimeterHit * b){
     return sqrt( pow(a->getXPos() - b->getXPos(),2)  // distance
                + pow(a->getYPos() - b->getYPos(),2)
-               + pow(a->getZPos() - b->getZPos(),2)/clusterZBias_);  // divide by the z bias
+	       + pow((a->getZPos() - b->getZPos())/clusterZBias_,2) );  // divide by the z bias
   }
   
   // specific verbosity of this producer
diff --git a/Recon/src/Recon/PFTrackProducer.cxx b/Recon/src/Recon/PFTrackProducer.cxx
index 5e4597556..d3e9a381a 100644
--- a/Recon/src/Recon/PFTrackProducer.cxx
+++ b/Recon/src/Recon/PFTrackProducer.cxx
@@ -25,6 +25,7 @@ void PFTrackProducer::produce(framework::Event& event) {
   if(truthTracking_){ 
     for(const auto &spHit : ecalSpHits){
       if ( spHit.getTrackID()!=1 || fabs(240-spHit.getPosition()[2])>0.1  || spHit.getMomentum()[2] <= 0 ) continue;
+      if ( spHit.getPdgID() == 22 || spHit.getPdgID() == 2112 ) continue
       pfTracks.push_back(spHit);
       break;
     }
@@ -62,4 +63,4 @@ void PFTrackProducer::onProcessEnd() {
 
 }  // namespace recon
 
-DECLARE_PRODUCER_NS(recon, PFTrackProducer);
\ No newline at end of file
+DECLARE_PRODUCER_NS(recon, PFTrackProducer);
diff --git a/Recon/src/Recon/ParticleFlow.cxx b/Recon/src/Recon/ParticleFlow.cxx
index dec0286ee..4b79f1a4a 100644
--- a/Recon/src/Recon/ParticleFlow.cxx
+++ b/Recon/src/Recon/ParticleFlow.cxx
@@ -238,7 +238,7 @@ void ParticleFlow::produce(framework::Event& event) {
     // std::vector<ldmx::PFCandidate> chargedMatch;
     // std::vector<ldmx::PFCandidate> chargedUnmatch;
     for(int i=0; i<tracks.size(); i++){
-      if (tracks[i].getPdgID()==22 || tracks[i].getPdgID()==2112) continue;  // abandon build track if photon or neutron
+      //if (tracks[i].getPdgID()==22 || tracks[i].getPdgID()==2112) continue;  // abandon build track if photon or neutron
       ldmx::PFCandidate cand;
       FillCandTrack(cand, tracks[i]);  // append track info to candidate
       
@@ -258,7 +258,8 @@ void ParticleFlow::produce(framework::Event& event) {
     // std::vector<ldmx::PFCandidate> emUnmatch;
     for(int i=0; i<ecalClusters.size(); i++){
       // already linked with ECal in the previous step
-      if((EMIsTkLinked[i]) && (!(tracks[i].getPdgID()==22 || tracks[i].getPdgID()==2112))) continue;  // must also be charged for EMIsTkLinked to make sense
+      if(EMIsTkLinked[i]) continue;
+      //if((EMIsTkLinked[i]) && (!(tracks[i].getPdgID()==22 || tracks[i].getPdgID()==2112))) continue;  // must also be charged for EMIsTkLinked to make sense
 
       ldmx::PFCandidate cand;
       FillCandEMCalo(cand, ecalClusters[i]);