diff --git a/panda/src/particlesystem/boxEmitter.h b/panda/src/particlesystem/boxEmitter.h
index 13e2c1ac76..33d3e2ecfc 100644
--- a/panda/src/particlesystem/boxEmitter.h
+++ b/panda/src/particlesystem/boxEmitter.h
@@ -1,6 +1,6 @@
 // Filename: boxEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef BOXEMITTER_H
@@ -10,13 +10,16 @@
 
 ////////////////////////////////////////////////////////////////////
 //       Class : BoxEmitter
-// Description : Describes a voluminous box region in which 
+// Description : Describes a voluminous box region in which
 //               particles are generated.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDAPHYSICS BoxEmitter : public BaseParticleEmitter {
 private:
   LPoint3f _vmin, _vmax;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   virtual void assign_initial_position(LPoint3f& pos);
   virtual void assign_initial_velocity(LVector3f& vel);
 
diff --git a/panda/src/particlesystem/discEmitter.cxx b/panda/src/particlesystem/discEmitter.cxx
index 337e76fdd1..c5e2b93ddc 100644
--- a/panda/src/particlesystem/discEmitter.cxx
+++ b/panda/src/particlesystem/discEmitter.cxx
@@ -14,7 +14,7 @@ DiscEmitter::
 DiscEmitter(void) {
   _radius = 1.0f;
   _inner_aoe = _outer_aoe = 0.0f;
-  _inner_magnitude = _outer_magnitude = 0.0f;
+  _inner_magnitude = _outer_magnitude = 1.0f;
   _cubic_lerping = false;
 }
 
diff --git a/panda/src/particlesystem/discEmitter.h b/panda/src/particlesystem/discEmitter.h
index 121e72c9cb..37e4703415 100644
--- a/panda/src/particlesystem/discEmitter.h
+++ b/panda/src/particlesystem/discEmitter.h
@@ -1,6 +1,6 @@
 // Filename: discEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DISCEMITTER_H
@@ -16,6 +16,8 @@
 class EXPCL_PANDAPHYSICS DiscEmitter : public BaseParticleEmitter {
 private:
   float _radius;
+
+  // CUSTOM EMISSION PARAMETERS
   float _outer_aoe, _inner_aoe;
   float _outer_magnitude, _inner_magnitude;
   bool _cubic_lerping;
diff --git a/panda/src/particlesystem/lineEmitter.h b/panda/src/particlesystem/lineEmitter.h
index 49279e1c77..8ade5a55fd 100644
--- a/panda/src/particlesystem/lineEmitter.h
+++ b/panda/src/particlesystem/lineEmitter.h
@@ -1,6 +1,6 @@
 // Filename: lineEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef LINEEMITTER_H
@@ -17,6 +17,9 @@ class EXPCL_PANDAPHYSICS LineEmitter : public BaseParticleEmitter {
 private:
   LPoint3f _endpoint1, _endpoint2;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   virtual void assign_initial_position(LPoint3f& pos);
   virtual void assign_initial_velocity(LVector3f& vel);
 
diff --git a/panda/src/particlesystem/pointEmitter.h b/panda/src/particlesystem/pointEmitter.h
index dc256d6012..3adfac5f09 100644
--- a/panda/src/particlesystem/pointEmitter.h
+++ b/panda/src/particlesystem/pointEmitter.h
@@ -1,6 +1,6 @@
 // Filename: pointEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef POINTEMITTER_H
@@ -17,9 +17,12 @@ class EXPCL_PANDAPHYSICS PointEmitter : public BaseParticleEmitter {
 private:
   LPoint3f _location;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   virtual void assign_initial_position(LPoint3f& pos);
   virtual void assign_initial_velocity(LVector3f& vel);
- 
+
 PUBLISHED:
   PointEmitter(void);
   PointEmitter(const PointEmitter &copy);
diff --git a/panda/src/particlesystem/rectangleEmitter.h b/panda/src/particlesystem/rectangleEmitter.h
index 2d63636bd5..1db5692d9e 100644
--- a/panda/src/particlesystem/rectangleEmitter.h
+++ b/panda/src/particlesystem/rectangleEmitter.h
@@ -1,6 +1,6 @@
 // Filename: rectangleEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef RECTANGLEEMITTER_H
@@ -17,6 +17,9 @@ class EXPCL_PANDAPHYSICS RectangleEmitter : public BaseParticleEmitter {
 private:
   LPoint2f _vmin, _vmax;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   virtual void assign_initial_position(LPoint3f& pos);
   virtual void assign_initial_velocity(LVector3f& vel);
 
diff --git a/panda/src/particlesystem/ringEmitter.cxx b/panda/src/particlesystem/ringEmitter.cxx
index f5dff4c28b..a907a687de 100644
--- a/panda/src/particlesystem/ringEmitter.cxx
+++ b/panda/src/particlesystem/ringEmitter.cxx
@@ -50,7 +50,7 @@ make_copy(void) {
 }
 
 ////////////////////////////////////////////////////////////////////
-//    Function : DiscEmitter::assign_initial_position
+//    Function : RingEmitter::assign_initial_position
 //      Access : Public
 // Description : Generates a location for a new particle
 ////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ assign_initial_position(LPoint3f& pos) {
 }
 
 ////////////////////////////////////////////////////////////////////
-//    Function : DiscEmitter::assign_initial_velocity
+//    Function : RingEmitter::assign_initial_velocity
 //      Access : Public
 // Description : Generates a velocity for a new particle
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/ringEmitter.h b/panda/src/particlesystem/ringEmitter.h
index 2e197f6e4d..6c0cc2cba7 100644
--- a/panda/src/particlesystem/ringEmitter.h
+++ b/panda/src/particlesystem/ringEmitter.h
@@ -1,6 +1,6 @@
 // Filename: ringEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef RINGEMITTER_H
@@ -16,8 +16,9 @@
 class EXPCL_PANDAPHYSICS RingEmitter : public BaseParticleEmitter {
 private:
   float _radius;
+
+  // CUSTOM EMISSION PARAMETERS
   float _aoe;  // angle of elevation
-  float _mag;
 
   ///////////////////////////////
   // scratch variables that carry over from position calc to velocity calc
diff --git a/panda/src/particlesystem/sphereSurfaceEmitter.h b/panda/src/particlesystem/sphereSurfaceEmitter.h
index a757c9de97..12b71827ff 100644
--- a/panda/src/particlesystem/sphereSurfaceEmitter.h
+++ b/panda/src/particlesystem/sphereSurfaceEmitter.h
@@ -1,6 +1,6 @@
 // Filename: sphereSurfaceEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef SPHERESURFACEEMITTER_H
@@ -17,6 +17,9 @@ class EXPCL_PANDAPHYSICS SphereSurfaceEmitter : public BaseParticleEmitter {
 private:
   float _radius;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   virtual void assign_initial_position(LPoint3f& pos);
   virtual void assign_initial_velocity(LVector3f& vel);
 
diff --git a/panda/src/particlesystem/sphereVolumeEmitter.h b/panda/src/particlesystem/sphereVolumeEmitter.h
index b61a71d3ee..45bdfbd315 100644
--- a/panda/src/particlesystem/sphereVolumeEmitter.h
+++ b/panda/src/particlesystem/sphereVolumeEmitter.h
@@ -1,6 +1,6 @@
 // Filename: sphereVolumeEmitter.h
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef SPHEREVOLUMEEMITTER_H
@@ -17,6 +17,9 @@ class EXPCL_PANDAPHYSICS SphereVolumeEmitter : public BaseParticleEmitter {
 private:
   float _radius;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   ///////////////////////////////
   // scratch variables that carry over from position calc to velocity calc
   LPoint3f _particle_pos;
diff --git a/panda/src/particlesystem/tangentRingEmitter.h b/panda/src/particlesystem/tangentRingEmitter.h
index 27cfb173ad..288b1c6bec 100644
--- a/panda/src/particlesystem/tangentRingEmitter.h
+++ b/panda/src/particlesystem/tangentRingEmitter.h
@@ -1,6 +1,6 @@
 // Filename: tangentRingEmitter.h
 // Created by:  charles (25Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef TANGENTRINGEMITTER_H
@@ -18,6 +18,9 @@ class EXPCL_PANDAPHYSICS TangentRingEmitter : public BaseParticleEmitter {
 private:
   float _radius;
 
+  // CUSTOM EMISSION PARAMETERS
+  // none
+
   ///////////////////////////////
   // scratch variables that carry over from position calc to velocity calc
   float _x, _y;