Debugging lack of accuracy with occlusion
Fixed merge conflicts
Testing with accuracy issues