diff --git a/orte/mca/gpr/proxy/gpr_proxy_component.c b/orte/mca/gpr/proxy/gpr_proxy_component.c
index fbd6961ad7..397d84a805 100644
--- a/orte/mca/gpr/proxy/gpr_proxy_component.c
+++ b/orte/mca/gpr/proxy/gpr_proxy_component.c
@@ -215,7 +215,8 @@ orte_gpr_proxy_component_init(bool *allow_multi_user_threads, bool *have_hidden_
     if (NULL != orte_process_info.gpr_replica_uri) {
 
     	if (orte_gpr_proxy_globals.debug) {
-    	    opal_output(0, "gpr_proxy_init: proxy selected");
+    	    opal_output(0, "[%lu,%lu,%lu] gpr_proxy_init: proxy selected",
+                        ORTE_NAME_ARGS(orte_process_info.my_name));
     	}
     
         /* setup the replica location */
@@ -297,7 +298,8 @@ int orte_gpr_proxy_finalize(void)
 {
 
     if (orte_gpr_proxy_globals.debug) {
-	   opal_output(0, "finalizing gpr proxy");
+	   opal_output(0, "[%lu,%lu,%lu] gpr_proxy_finalize called",
+                        ORTE_NAME_ARGS(orte_process_info.my_name));
     }
 
     if (initialized) {
@@ -326,7 +328,7 @@ void orte_gpr_proxy_notify_recv(int status, orte_process_name_t* sender,
     int rc;
 
     if (orte_gpr_proxy_globals.debug) {
-	    opal_output(0, "[%lu,%lu,%lu] gpr proxy: received trigger message",
+	    opal_output(0, "[%lu,%lu,%lu] gpr_proxy_notify_recv: received trigger message",
 				ORTE_NAME_ARGS(orte_process_info.my_name));
     }
 
diff --git a/orte/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c b/orte/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c
index 055ff3e7db..4fd9b484ce 100644
--- a/orte/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c
+++ b/orte/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c
@@ -46,8 +46,8 @@ int orte_gpr_replica_subscribe_fn(orte_process_name_t *requestor,
     int rc=ORTE_SUCCESS;
 
     if (orte_gpr_replica_globals.debug) {
-	   opal_output(0, "[%lu,%lu,%lu] gpr replica: subscribe entered",
-		    ORTE_NAME_ARGS(orte_process_info.my_name));
+        opal_output(0, "[%lu,%lu,%lu] gpr_replica_subscribe: entered with num_trigs:%d",
+                    ORTE_NAME_ARGS(orte_process_info.my_name), num_trigs);
     }
 
     /* ensure one of the search arrays is clear - in this case, we
diff --git a/orte/mca/pls/rsh/pls_rsh.h b/orte/mca/pls/rsh/pls_rsh.h
index bf341bffb0..d385dd6a4d 100644
--- a/orte/mca/pls/rsh/pls_rsh.h
+++ b/orte/mca/pls/rsh/pls_rsh.h
@@ -13,6 +13,10 @@
  * 
  * $HEADER$
  */
+/**
+ * @file:
+ * Part of the rsh launcher. See pls_rsh.h for an overview of how it works.
+ */
 
 #ifndef ORTE_PLS_RSH_EXPORT_H
 #define ORTE_PLS_RSH_EXPORT_H
diff --git a/orte/mca/rmgr/base/rmgr_base_context.c b/orte/mca/rmgr/base/rmgr_base_context.c
index c19816e596..67e71aade9 100644
--- a/orte/mca/rmgr/base/rmgr_base_context.c
+++ b/orte/mca/rmgr/base/rmgr_base_context.c
@@ -285,5 +285,3 @@ int orte_rmgr_base_set_job_slots(orte_jobid_t jobid, size_t proc_slots)
     free(segment);
     return rc;
 }
-
-
diff --git a/orte/runtime/orte_init_stage1.c b/orte/runtime/orte_init_stage1.c
index 21e47802a2..3a56053771 100644
--- a/orte/runtime/orte_init_stage1.c
+++ b/orte/runtime/orte_init_stage1.c
@@ -170,7 +170,7 @@ int orte_init_stage1(void)
     }
 
     /*
-     * Initialize and select sds
+     * Initialize and select the Startup Discovery Service
      */
     if (ORTE_SUCCESS != (ret = orte_sds_base_open())) {
         ORTE_ERROR_LOG(ret);