2d overshoot and eigenvalue fixes