moved make_camera_ray, fixed two bugs