more fixes in patches to RayTracer