--- ray/src/rt/rv2.c	1996/02/14 15:25:34	2.34
+++ ray/src/rt/rv2.c	1997/03/18 18:09:15	2.37
@@ -499,7 +499,7 @@ register char  *s;
 	extern int  ambssamp;
 	extern int  ambounce;
 	extern COLOR  cextinction;
-	extern double  salbedo;
+	extern COLOR  salbedo;
 	extern double  seccg;
 	extern double  ssampdist;
 	extern int  directvis;
@@ -605,7 +605,8 @@ register char  *s;
 					(COLOR *)cextinction);
 			break;
 		case 'a':			/* scattering albedo */
-			getparam(s+2, "scattering albedo", 'r', &salbedo);
+			getparam(s+2, "scattering albedo", 'C',
+					(COLOR *)salbedo);
 			break;
 		case 'g':			/* scattering eccentricity */
 			getparam(s+2, "scattering eccentricity", 'r', &seccg);
@@ -661,6 +662,7 @@ char  *s;
 {
 	char  buf[128];
 	int  x, y;
+	OBJREC	*ino;
 	RAY  thisray;
 
 	thisray.rmax = 0.0;
@@ -698,6 +700,9 @@ char  *s;
 					objptr(thisray.ro->omod)->oname,
 				ofun[thisray.ro->otype].funame,
 				thisray.ro->oname);
+		if ((ino = objptr(thisray.robj)) != thisray.ro)
+			sprintf(buf+strlen(buf), " in %s \"%s\"",
+					ofun[ino->otype].funame, ino->oname);
 		(*dev->comout)(buf);
 		(*dev->comin)(buf, NULL);
 		if (thisray.rot >= FHUGE)