Rippling and ray_tracin fixes