BUG: 2D smoothing enabled; code cleanup for p-Eigen