Index: /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/BrightCatalog.c
===================================================================
--- /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/BrightCatalog.c	(revision 39211)
+++ /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/BrightCatalog.c	(revision 39212)
@@ -191,4 +191,5 @@
     ALLOCATE (average, Average, Nrow);
     for (i = 0; i < Nrow; i++) {
+      dvo_average_init (&average[i]);
       average[i].R               = R[i]               ;
       average[i].D               = D[i]               ;
@@ -495,6 +496,8 @@
     gfits_define_bintable_column (&theader, "E", "U_RA",           "RA*cos(D) proper-motion", 	         		  "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "U_DEC",          "DEC proper-motion", 	         	 	  "", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "V_RA_ERR",       "RA*cos(D) p-m error", 	         	 	  "", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "V_DEC_ERR",      "DEC p-m error", 	         	 		  "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_RA_ERR",       "RA*cos(D) p-m error", 	         	 	  "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_DEC_ERR",      "DEC p-m error", 	         	 		  "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_RA_GAL",       "RA*cos(D) p-m error", 	         	 	  "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_DEC_GAL",      "DEC p-m error", 	         	 		  "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "PAR",            "parallax", 	                         		  "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "PAR_ERR",        "parallax error", 	                 		  "", 1.0, 0.0);
Index: /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/bcatalog.c
===================================================================
--- /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/bcatalog.c	(revision 39211)
+++ /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/bcatalog.c	(revision 39212)
@@ -117,4 +117,13 @@
       if (!isfinite(catalog[0].average[i].uRgal)) continue;
       if (!isfinite(catalog[0].average[i].uDgal)) continue;
+      
+      // filter stars which are not well-handled by the galactic motion model
+      int mStarpar = catalog[0].average[i].starparOffset;
+      myAssert (mStarpar < catalog[0].Nstarpar, "oops");
+      
+      StarPar *starpar = &catalog[0].starpar[mStarpar];
+      if (starpar->DistMag  < MIN_DISTANCE_MOD) continue;
+      if (starpar->DistMag  > MAX_DISTANCE_MOD) continue;
+      if (starpar->dDistMag > MAX_DISTANCE_MOD_ERR) continue;
     }
 
Index: /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/load_catalogs.c
===================================================================
--- /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/load_catalogs.c	(revision 39211)
+++ /branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/load_catalogs.c	(revision 39212)
@@ -44,4 +44,8 @@
     pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
     pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
+
+    if (USE_GALAXY_MODEL) {
+      pcatalog->catflags = pcatalog->catflags | DVO_LOAD_STARPAR;
+    }
 
     // loads Average, Measure, SecFilt