Fixed the passivity bug and cusum-bug but pointsofitnerest still lingers