Various fixes.

2D tests still pass. 3D displacements reasonable.