Non-line-of-sight Imaging with Partial Occluders and Surface Normals