cleaned up raytrace function
merged conflicts