--- ray/src/rt/rv2.c	1993/09/09 13:47:55	2.20
+++ ray/src/rt/rv2.c	1994/07/12 15:24:28	2.25
@@ -32,6 +32,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern char  *atos();
 
+extern FILE  *popen();
+
 extern char  rifname[128];		/* rad input file name */
 
 extern char  VersionID[];
@@ -348,12 +350,13 @@ char  *s;
 	register PNODE  *p = &ptrunk;
 	int  adapt = 0;
 	double  e = 1.0;
-start:
+
 	for (cp = s; isspace(*cp); cp++)
 		;
 	if (*cp == '@') {
 		adapt++;
-		goto start;
+		while (isspace(*++cp))
+			;
 	}
 	if (*cp == '\0') {		/* normalize to point */
 		if (dev->getcur == NULL)
@@ -634,8 +637,10 @@ char  *s;
 	if (thisray.ro == NULL)
 		(*dev->comout)("ray hit nothing");
 	else {
-		sprintf(buf, "ray hit %s %s \"%s\"",
-				objptr(thisray.ro->omod)->oname,
+		sprintf(buf, "ray hit %s%s %s \"%s\"",
+				thisray.rod < 0.0 ? "back of " : "",
+				thisray.ro->omod == OVOID ? VOIDID :
+					objptr(thisray.ro->omod)->oname,
 				ofun[thisray.ro->otype].funame,
 				thisray.ro->oname);
 		(*dev->comout)(buf);
@@ -689,6 +694,7 @@ char  *s;
 	(*dev->comout)(fname);
 	(*dev->comout)("\"...\n");
 						/* write header */
+	newheader("RADIANCE", fp);
 	fputs(progname, fp);
 	fprintview(&ourview, fp);
 	if (octname != NULL)