some progress on undershoot/overshoot bugginess