diff --git a/src/star_system.cpp b/src/star_system.cpp
index d7f4357..38fd2c0 100644
--- a/src/star_system.cpp
+++ b/src/star_system.cpp
@@ -2,6 +2,7 @@
 #include "sector.h"
 
 #define CELSIUS 273.15
+#define DEBUG_DUMP
 
 /* Indexed by enum type. */
 float StarSystem::starColors[7][3] = {
@@ -174,7 +175,6 @@ vector3d StarSystem::Orbit::CartesianPosAtTime(double t) {
 }
 
 static std::vector<int>* AccreteDisc(int size, int bandSize, int density, MTRand& rand) {
-  printf("Size %d\n", size);
   std::vector<int>* disc = new std::vector<int>(size);
 
   int bandDensity = 0;
@@ -307,6 +307,11 @@ StarSystem::StarSystem(int sector_x, int sector_y, int system_idx) {
     (*i)->name = primary->name+buf;
     double d = 0.5*((*i)->radMin + (*i)->radMax);
     (*i)->PickPlanetType(primary, d, rand, true);
+
+#ifdef DEBUG_DUMP
+    printf("%s: mass %f, semi-major axis %fAU, ecc %f\n", (*i)->name.c_str(),
+        (*i)->mass/EARTH_MASS, (*i)->orbit.semiMajorAxis/AU, (*i)->orbit.eccentricity);
+#endif
   }
 }
 
@@ -404,7 +409,7 @@ void StarSystem::SBody::PickPlanetType(SBody* star, double distToPrimary, MTRand
   radius = EARTH_RADIUS*bodyTypeInfo[type].radius;
   /* Generate moons. */
   if((genMoons) && (emass > 0.5)) {
-    std::vector<int>* disc = AccreteDisc(2*sqrt(emass), 10, rand.Int32(1, 40), rand);
+    std::vector<int>* disc = AccreteDisc(2*sqrt(emass), 10, rand.Int32(1, 10), rand);
     for(unsigned int i = 0; i < disc->size(); i++) {
       float mass = (*disc)[i]/65536.0;
       if(mass == 0) continue;