diff --git a/src/incflo.H b/src/incflo.H
index f39a12c7..09347327 100644
--- a/src/incflo.H
+++ b/src/incflo.H
@@ -556,7 +556,7 @@ private:
     bool  m_use_tracer_particles; /*!< tracer particles that advect with flow */
 
     /*! Read tracer particles parameters */
-    void readTracersParams ();
+    void readTracerParticlesParams ();
 
     /*! Initialize tracer particles */
     void initializeTracerParticles (amrex::ParGDBBase* gdb
diff --git a/src/incflo_advance.cpp b/src/incflo_advance.cpp
index 82fd2eed..9b387433 100644
--- a/src/incflo_advance.cpp
+++ b/src/incflo_advance.cpp
@@ -66,6 +66,10 @@ void incflo::Advance()
         ApplyCorrector();
     }
 
+#ifdef INCFLO_USE_PARTICLES
+    particleData.Redistribute();
+#endif
+
 #if 0
     // This sums over all levels
     if (m_test_tracer_conservation) {
@@ -82,9 +86,5 @@ void incflo::Advance()
     {
         amrex::Print() << "Time per step " << end_step << std::endl;
     }
-
-#ifdef INCFLO_USE_PARTICLES
-    particleData.Redistribute();
-#endif
 }
 
diff --git a/src/particles/incflo_PC.H b/src/particles/incflo_PC.H
index 0412c147..4cdf0eb1 100644
--- a/src/particles/incflo_PC.H
+++ b/src/particles/incflo_PC.H
@@ -137,7 +137,7 @@ class incflo_PC : public amrex::ParticleContainer<  incflo_ParticlesRealIdxAoS::
             if (a_var_name == "mass_density") {
                 massDensity( a_mf, a_lev );
             } else {
-                a_mf.setVal(0.0);
+                amrex::Abort("this variable not defined in computeMeshVar");
             }
         }
 
diff --git a/src/particles/incflo_PCInit.cpp b/src/particles/incflo_PCInit.cpp
index 0966bda7..12d2e1b8 100644
--- a/src/particles/incflo_PCInit.cpp
+++ b/src/particles/incflo_PCInit.cpp
@@ -228,7 +228,7 @@ void incflo_PC::initializeParticlesUniformDistributionInBox ( const RealBox& par
     Real x_ctr = cyl_center[0];
     Real y_ctr = cyl_center[1];
 
-    // Remove particles that are outside of the cylindner
+    // Remove particles that are outside of the cylinder
     for (ParIterType pti(*this, lev); pti.isValid(); ++pti)
     {
         auto& ptile = ParticlesAt(lev, pti);
diff --git a/src/particles/incflo_Tracers.cpp b/src/particles/incflo_Tracers.cpp
index a5ceac8a..a19a587e 100644
--- a/src/particles/incflo_Tracers.cpp
+++ b/src/particles/incflo_Tracers.cpp
@@ -7,7 +7,7 @@
 using namespace amrex;
 
 /*! Read tracer particles parameters */
-void incflo::readTracersParams ()
+void incflo::readTracerParticlesParams ()
 {
     ParmParse pp("incflo");
 
diff --git a/src/setup/init.cpp b/src/setup/init.cpp
index 2b184ea0..92aab413 100644
--- a/src/setup/init.cpp
+++ b/src/setup/init.cpp
@@ -196,7 +196,7 @@ void incflo::ReadParameters ()
 #endif
 
 #ifdef INCFLO_USE_PARTICLES
-    readTracersParams();
+    readTracerParticlesParams();
 #endif
 }
 
diff --git a/src/utilities/io.cpp b/src/utilities/io.cpp
index 01b1bcb6..2f4ba735 100644
--- a/src/utilities/io.cpp
+++ b/src/utilities/io.cpp
@@ -447,7 +447,7 @@ void incflo::WritePlotFile()
         pltscaVarsName.push_back("gpx");
         ++icomp;
     }
-if (m_plt_gpy) {
+    if (m_plt_gpy) {
         for (int lev = 0; lev <= finest_level; ++lev) {
             MultiFab::Copy(mf[lev], m_leveldata[lev]->gp, 1, icomp, 1, 0);
         }