diff --git a/src/srun/io.c b/src/srun/io.c
index f3a11713a1b41fff19c2a81ea0b5d0dec7684a7b..70f24b82008e77c982493ca7efd427e4c4d2c036 100644
--- a/src/srun/io.c
+++ b/src/srun/io.c
@@ -1,3 +1,28 @@
+/****************************************************************************\
+ *  io.c - process stdin, stdout, and stderr for parallel jobs.
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Mark Grondona <grondona@llnl.gov>, et. al.
+ *  UCRL-CODE-2002-040.
+ *  
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *  
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *  
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *  
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -17,9 +42,9 @@
 #include <src/common/slurm_protocol_defs.h>
 #include <src/common/slurm_protocol_pack.h>
 
-#include "opt.h"
-#include "job.h"
-#include "net.h"
+#include <src/srun/job.h>
+#include <src/srun/net.h>
+#include <src/srun/opt.h>
 
 #define IO_BUFSIZ	2048
 #define IO_DONE		-9	/* signify that eof has been recvd on stream */
@@ -151,7 +176,7 @@ _io_thr_poll(void *job_arg)
 				eofcnt++;
 		}
 
-		/* exit if we have recieved eof on all streams */
+		/* exit if we have received eof on all streams */
 		if (eofcnt == opt.nprocs)
 			pthread_exit(0);
 
@@ -233,7 +258,7 @@ _io_thr_poll(void *job_arg)
 				eofcnt++;
 		}
 
-		/* exit if we have recieved eof on all streams */
+		/* exit if we have received eof on all streams */
 		if (eofcnt == opt.nprocs)
 			pthread_exit(0);
 
diff --git a/src/srun/launch.c b/src/srun/launch.c
index 53318f36b9e871f718aab3d369e680d31d6f8950..b549e6558439676ce3508f7972c4c530b2dfe20e 100644
--- a/src/srun/launch.c
+++ b/src/srun/launch.c
@@ -105,7 +105,7 @@ launch(void *arg)
 	/* Build task id list for each host */
 	task_ids = (uint32_t **) xmalloc(job->nhosts * sizeof(uint32_t *));
 	for (i = 0; i < job->nhosts; i++)
-		task_ids[i] = (uint32_t *) xmalloc(job->ntask[i]*sizeof(uint32_t));
+		task_ids[i] = (uint32_t *) xmalloc(job->cpus[i]*sizeof(uint32_t));
 	taskid = 0;
 	if (opt.distribution == SRUN_DIST_BLOCK) {
 		for (i=0; ((i<job->nhosts) && (taskid<opt.nprocs)); i++) {
diff --git a/src/srun/msg.c b/src/srun/msg.c
index e36e006e389719c9eb7a05a203464068d90863d8..c8f34b82c5c764a5d5075686045cb55b188a3806 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -1,3 +1,29 @@
+/****************************************************************************\
+ *  msg.c - 
+ *****************************************************************************
+ *  Copyright (C) 2002 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Mark Grondona <grondona@llnl.gov>, et. al.
+ *  UCRL-CODE-2002-040.
+ *  
+ *  This file is part of SLURM, a resource management program.
+ *  For details, see <http://www.llnl.gov/linux/slurm/>.
+ *  
+ *  SLURM is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *  
+ *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ *  details.
+ *  
+ *  You should have received a copy of the GNU General Public License along
+ *  with SLURM; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+\*****************************************************************************/
+
 #include <errno.h>
 #include <pthread.h>
 #include <sys/poll.h>
@@ -10,8 +36,8 @@
 #include <src/common/log.h>
 #include <src/common/xassert.h>
 
-#include "job.h"
-#include "opt.h"
+#include <src/srun/job.h>
+#include <src/srun/opt.h>
 
 static int tasks_exited = 0;
 
@@ -36,7 +62,7 @@ _launch_handler(job_t *job, slurm_msg_t *resp)
 	launch_tasks_response_msg_t *msg = 
 		(launch_tasks_response_msg_t *) resp->data;
 
-	debug2("recieved launch resp from %s nodeid=%d", msg->node_name,
+	debug2("received launch resp from %s nodeid=%d", msg->node_name,
 			msg->srun_node_id);
 	
 	if (msg->return_code != 0)  {
@@ -84,7 +110,7 @@ _handle_msg(job_t *job, slurm_msg_t *msg)
 			debug("recvd reattach response\n");
 			break;
 		default:
-			error("recieved spurious message type: %d\n",
+			error("received spurious message type: %d\n",
 					msg->msg_type);
 			break;
 	}