Some more kalman2 editing.